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

            A new commit has been pushed.

            Repo   : rpms/chromium
            Branch : epel10
            Commit : 49ff1da8fc427494cfb8e9b5d9baba9cca268bf4
            Author : Than Ngo <than@redhat.com>
            Date   : 2026-06-05T15:39:08+02:00
            Stats  : +23009/-18967 in 16 file(s)
            URL    : https://src.fedoraproject.org/rpms/chromium/c/49ff1da8fc427494cfb8e9b5d9baba9cca268bf4?branch=epel10

            Log:
            - Update to 149.0.7827.53
  * CVE-2026-10881: Out of bounds read and write in ANGLE
  * CVE-2026-10882: Use after free in Network
  * CVE-2026-10883: Out of bounds write in ANGLE
  * CVE-2026-10884: Use after free in Chromecast
  * CVE-2026-10885: Use after free in Chrome for iOS
  * CVE-2026-10886: Use after free in FileSystem
  * CVE-2026-10887: Use after free in Chromoting
  * CVE-2026-10888: Use after free in Cast Streaming
  * CVE-2026-10889: Out of bounds read in ANGLE
  * CVE-2026-10890: Use after free in Cast
  * CVE-2026-10891: Use after free in GFX
  * CVE-2026-10892: Out of bounds write in GPU
  * CVE-2026-10893: Use after free in Chromoting
  * CVE-2026-10894: Use after free in Printing
  * CVE-2026-10895: Use after free in Ozone
  * CVE-2026-10896: Use after free in Chrome for iOS
  * CVE-2026-10897: Out of bounds write in GPU
  * CVE-2026-10898: Stack buffer overflow in GPU
  * CVE-2026-10899: Use after free in Ozone
  * CVE-2026-10900: Use after free in Passwords
  * CVE-2026-10901: Use after free in Passwords
  * CVE-2026-10902: Use after free in Ozone
  * CVE-2026-10903: Use after free in WebRTC
  * CVE-2026-10904: Inappropriate implementation in V8
  * CVE-2026-10905: Use after free in Network
  * CVE-2026-10906: Use after free in WebAuthentication
  * CVE-2026-10907: Out of bounds write in ANGLE
  * CVE-2026-10908: Use after free in FullScreen
  * CVE-2026-10909: Use after free in Dawn
  * CVE-2026-10910: Type Confusion in V8
  * CVE-2026-10911: Insufficient validation of untrusted input in Media
  * CVE-2026-10912: Insufficient validation of untrusted input in Extensions
  * CVE-2026-10913: Use after free in ANGLE
  * CVE-2026-10914: Use after free in ANGLE
  * CVE-2026-10915: Use after free in Core
  * CVE-2026-10916: Insufficient validation of untrusted input in DevTools
  * CVE-2026-10917: Insufficient validation of untrusted input in Media
  * CVE-2026-10918: Use after free in Viz
  * CVE-2026-10919: Use after free in ANGLE
  * CVE-2026-10920: Insufficient validation of untrusted input in WebShare
  * CVE-2026-10921: Integer overflow in Dawn
  * CVE-2026-10922: Insufficient validation of untrusted input in DevTools
  * CVE-2026-10923: Use after free in WebAppInstalls
  * CVE-2026-10924: Integer overflow in Chromecast
  * CVE-2026-10925: Out of bounds write in Skia
  * CVE-2026-10926: Use after free in Cast
  * CVE-2026-10927: Out of bounds read in Dawn
  * CVE-2026-10928: Script injection in Headless
  * CVE-2026-10929: Heap buffer overflow in ANGLE
  * CVE-2026-10930: Out of bounds read in ANGLE
  * CVE-2026-10931: Use after free in FileSystem
  * CVE-2026-10932: Use after free in UI
  * CVE-2026-10933: Use after free in Audio
  * CVE-2026-10934: Use after free in Autofill
  * CVE-2026-10935: Inappropriate implementation in V8
  * CVE-2026-10936: Type Confusion in V8
  * CVE-2026-10937: Inappropriate implementation in Passwords
  * CVE-2026-10938: Insufficient validation of untrusted input in Input
  * CVE-2026-10939: Use after free in WebRTC
  * CVE-2026-10940: Race in Codecs
  * CVE-2026-10941: Out of bounds memory access in Skia
  * CVE-2026-10942: Insufficient validation of untrusted input in UI
  * CVE-2026-10943: Use after free in WebRTC
  * CVE-2026-10944: Insufficient policy enforcement in Autofill
  * CVE-2026-10945: Use after free in PDF
  * CVE-2026-10946: Heap buffer overflow in Media
  * CVE-2026-10947: Use after free in WebRTC
  * CVE-2026-10948: Use after free in WebRTC
  * CVE-2026-10949: Heap buffer overflow in Video
  * CVE-2026-10950: Insufficient policy enforcement in Autofill
  * CVE-2026-10951: Use after free in Autofill
  * CVE-2026-10952: Use after free in Chrome for iOS
  * CVE-2026-10953: Use after free in Core
  * CVE-2026-10954: Use after free in Actor
  * CVE-2026-10955: Type Confusion in ANGLE
  * CVE-2026-10956: Use after free in MimeHandlerView
  * CVE-2026-10957: Use after free in Glic
  * CVE-2026-10958: Use after free in Chrome for iOS
  * CVE-2026-10959: Use after free in Input
  * CVE-2026-10960: Uninitialized Use in Codecs
  * CVE-2026-10961: Use after free in Chrome for iOS
  * CVE-2026-10962: Type Confusion in Media
  * CVE-2026-10963: Integer overflow in V8
  * CVE-2026-10964: Integer overflow in V8
  * CVE-2026-10965: Integer overflow in DevTools
  * CVE-2026-10966: Insufficient validation of untrusted input in Codecs
  * CVE-2026-10967: Use after free in SurfaceCapture
  * CVE-2026-10968: Insufficient validation of untrusted input in Dawn
  * CVE-2026-10969: Insufficient validation of untrusted input in Extensions
  * CVE-2026-10970: Insufficient validation of untrusted input in InterestGroups
  * CVE-2026-10971: Insufficient validation of untrusted input in Printing
  * CVE-2026-10972: Use after free in Ozone
  * CVE-2026-10973: Uninitialized Use in Dawn
  * CVE-2026-10974: Insufficient validation of untrusted input in ANGLE
  * CVE-2026-10975: Use after free in WebRTC
  * CVE-2026-10976: Uninitialized Use in Dawn
  * CVE-2026-10977: Uninitialized Use in Skia
  * CVE-2026-10978: Use after free in Chromoting
  * CVE-2026-10979: Out of bounds read in ANGLE
  * CVE-2026-10980: Insufficient validation of untrusted input in DevTools
  * CVE-2026-10981: Insufficient validation of untrusted input in Codecs
  * CVE-2026-10982: Use after free in WebXR
  * CVE-2026-10983: Insufficient validation of untrusted input in Dawn
  * CVE-2026-10984: Inappropriate implementation in Accessibility
  * CVE-2026-10985: Out of bounds read in Skia
  * CVE-2026-10986: Integer overflow in Media
  * CVE-2026-10987: Integer overflow in V8
  * CVE-2026-10988: Use after free in Views
  * CVE-2026-10989: Inappropriate implementation in V8
  * CVE-2026-10990: Use after free in Glic
  * CVE-2026-10991: Use after free in V8
  * CVE-2026-10992: Insufficient data validation in Animation
  * CVE-2026-10993: Heap buffer overflow in Skia
  * CVE-2026-10994: Uninitialized Use in ANGLE
  * CVE-2026-10995: Heap buffer overflow in TabStrip
  * CVE-2026-10996: Inappropriate implementation in Workers
  * CVE-2026-10997: Insufficient policy enforcement in Extensions
  * CVE-2026-10998: Out of bounds read in Media
  * CVE-2026-10999: Out of bounds memory access in ANGLE
  * CVE-2026-11000: Use after free in Fonts
  * CVE-2026-11001: Incorrect security UI in Payments
  * CVE-2026-11002: Use after free in Autofill
  * CVE-2026-11003: Use after free in WebRTC
  * CVE-2026-11004: Out of bounds read in ANGLE
  * CVE-2026-11005: Out of bounds read in ANGLE
  * CVE-2026-11006: Out of bounds read in Dawn
  * CVE-2026-11007: Insufficient validation of untrusted input in WebView
  * CVE-2026-11008: Insufficient validation of untrusted input in WebAppInstalls
  * CVE-2026-11009: Use after free in USB
  * CVE-2026-11010: Use after free in WebShare
  * CVE-2026-11011: Insufficient policy enforcement in Password Manager
  * CVE-2026-11012: Use after free in Serial
  * CVE-2026-11013: Insufficient validation of untrusted input in Network
  * CVE-2026-11014: Insufficient policy enforcement in Extensions
  * CVE-2026-11015: Out of bounds read in WebGPU
  * CVE-2026-11016: Insufficient validation of untrusted input in Network
  * CVE-2026-11017: Inappropriate implementation in Link Preview
  * CVE-2026-11018: Insufficient policy enforcement in Actor
  * CVE-2026-11019: Inappropriate implementation in Payments
  * CVE-2026-11020: Inappropriate implementation in Extensions
  * CVE-2026-11021: Insufficient validation of untrusted input in GPU
  * CVE-2026-11022: Insufficient validation of untrusted input in DevTools
  * CVE-2026-11023: Insufficient validation of untrusted input in WebAppInstalls
  * CVE-2026-11024: Stack buffer overflow in Skia
  * CVE-2026-11025: Insufficient policy enforcement in Navigation
  * CVE-2026-11026: Insufficient policy enforcement in Extensions
  * CVE-2026-11027: Insufficient validation of untrusted input in Glic
  * CVE-2026-11028: Use after free in Media
  * CVE-2026-11029: Insufficient validation of untrusted input in Drag and Drop
  * CVE-2026-11030: Use after free in Network
  * CVE-2026-11031: Insufficient validation of untrusted input in Password Manager
  * CVE-2026-11032: Insufficient data validation in Password Manager
  * CVE-2026-11033: Uninitialized Use in WebML
  * CVE-2026-11034: Insufficient validation of untrusted input in Tab Group Sync
  * CVE-2026-11035: Insufficient validation of untrusted input in Custom Tabs
  * CVE-2026-11036: Inappropriate implementation in DOM
  * CVE-2026-11037: Out of bounds write in Codecs
  * CVE-2026-11038: Insufficient validation of untrusted input in Subresource Integrity
  * CVE-2026-11039: Uninitialized Use in Skia
  * CVE-2026-11040: Use after free in ANGLE
  * CVE-2026-11041: Insufficient validation of untrusted input in Media
  * CVE-2026-11042: Use after free in Views
  * CVE-2026-11043: Out of bounds write in ANGLE
  * CVE-2026-11044: Integer overflow in ANGLE
  * CVE-2026-11045: Insufficient validation of untrusted input in GPU
  * CVE-2026-11046: Insufficient validation of untrusted input in Media
  * CVE-2026-11047: Insufficient validation of untrusted input in Base
  * CVE-2026-11048: Inappropriate implementation in Extensions
  * CVE-2026-11049: Use after free in Password Manager
  * CVE-2026-11050: Use after free in V8
  * CVE-2026-11051: Out of bounds read in ANGLE
  * CVE-2026-11052: Type Confusion in GPU
  * CVE-2026-11053: VULNERABILITY in WebRTC
  * CVE-2026-11054: Use after free in WebRTC
  * CVE-2026-11055: Use after free in ANGLE
  * CVE-2026-11056: Insufficient validation of untrusted input in SiteIsolation
  * CVE-2026-11057: Uninitialized Use in Skia
  * CVE-2026-11058: Integer overflow in CredentialProvider
  * CVE-2026-11059: Use after free in Blink
  * CVE-2026-11060: Use after free in Media
  * CVE-2026-11061: Out of bounds read in ANGLE
  * CVE-2026-11062: Insufficient policy enforcement in Extensions
  * CVE-2026-11063: Insufficient validation of untrusted input in WebNN
  * CVE-2026-11064: Uninitialized Use in GPU
  * CVE-2026-11065: Use after free in ANGLE
  * CVE-2026-11066: Insufficient validation of untrusted input in ANGLE
  * CVE-2026-11067: Uninitialized Use in Dawn
  * CVE-2026-11068: Use after free in WebSockets
  * CVE-2026-11069: Insufficient validation of untrusted input in Cast
  * CVE-2026-11070: Insufficient validation of untrusted input in Chromoting
  * CVE-2026-11071: Use after free in Base
  * CVE-2026-11072: Use after free in WebView
  * CVE-2026-11073: Use after free in WebGL
  * CVE-2026-11074: Use after free in WebRTC
  * CVE-2026-11075: Out of bounds read in V8
  * CVE-2026-11076: Type Confusion in CSS
  * CVE-2026-11077: Out of bounds read in Dawn
  * CVE-2026-11078: Insufficient validation of untrusted input in FileSystem
  * CVE-2026-11079: Insufficient validation of untrusted input in Codecs
  * CVE-2026-11080: Use after free in WebView
  * CVE-2026-11081: Policy bypass in Canvas
  * CVE-2026-11082: Use after free in GPU
  * CVE-2026-11083: Inappropriate implementation in Password Manager
  * CVE-2026-11084: Inappropriate implementation in Password Manager
  * CVE-2026-11085: Integer overflow in GPU
  * CVE-2026-11086: Insufficient validation of untrusted input in Dawn
  * CVE-2026-11087: Uninitialized Use in ANGLE
  * CVE-2026-11088: Integer overflow in ANGLE
  * CVE-2026-11089: Uninitialized Use in Media
  * CVE-2026-11090: Uninitialized Use in ANGLE
  * CVE-2026-11091: Inappropriate implementation in Dawn
  * CVE-2026-11092: Insufficient policy enforcement in DevTools
  * CVE-2026-11093: Insufficient validation of untrusted input in Printing
  * CVE-2026-11094: Use after free in Codecs
  * CVE-2026-11095: Insufficient validation of untrusted input in Codecs
  * CVE-2026-11096: Out of bounds read in WebRTC
  * CVE-2026-11097: Inappropriate implementation in WebView
  * CVE-2026-11098: Insufficient validation of untrusted input in GPU
  * CVE-2026-11099: Vulnerability in Skia
  * CVE-2026-11100: Use after free in File Input
  * CVE-2026-11101: Uninitialized Use in Dawn
  * CVE-2026-11102: Inappropriate implementation in Isolated Web Apps
  * CVE-2026-11103: Inappropriate implementation in Installer
  * CVE-2026-11104: Uninitialized Use in ANGLE
  * CVE-2026-11105: Insufficient validation of untrusted input in WebUI
  * CVE-2026-11106: Inappropriate implementation in Media
  * CVE-2026-11107: Inappropriate implementation in Downloads
  * CVE-2026-11108: Inappropriate implementation in NFC
  * CVE-2026-11109: Uninitialized Use in ANGLE
  * CVE-2026-11110: Uninitialized Use in ANGLE
  * CVE-2026-11111: Out of bounds read in ANGLE
  * CVE-2026-11112: Insufficient validation of untrusted input in Chromoting
  * CVE-2026-11113: Insufficient validation of untrusted input in ANGLE
  * CVE-2026-11114: Use after free in Device Trust
  * CVE-2026-11115: Use after free in Updater
  * CVE-2026-11116: Use after free in Chromoting
  * CVE-2026-11117: Use after free in Views
  * CVE-2026-11118: Use after free in WebRTC
  * CVE-2026-11119: Insufficient validation of untrusted input in GPU
  * CVE-2026-11120: Insufficient validation of untrusted input in Enterprise Reporting
  * CVE-2026-11121: Insufficient validation of untrusted input in Skia
  * CVE-2026-11122: Inappropriate implementation in Keyboard
  * CVE-2026-11123: Uninitialized Use in ANGLE
  * CVE-2026-11124: Heap buffer overflow in Skia
  * CVE-2026-11125: Use after free in Compositing
  * CVE-2026-11126: Insufficient validation of untrusted input in DevTools
  * CVE-2026-11127: Inappropriate implementation in WebAPKs
  * CVE-2026-11128: Insufficient validation of untrusted input in Web Share
  * CVE-2026-11129: Inappropriate implementation in Extensions
  * CVE-2026-11130: Use after free in Media
  * CVE-2026-11131: Use after free in Autofill
  * CVE-2026-11132: Policy bypass in Paint
  * CVE-2026-11133: Insufficient policy enforcement in Paint
  * CVE-2026-11134: Insufficient data validation in Media
  * CVE-2026-11135: Insufficient policy enforcement in Autofill
  * CVE-2026-11136: Use after free in Canvas
  * CVE-2026-11137: Uninitialized Use in ANGLE
  * CVE-2026-11138: Uninitialized Use in ANGLE
  * CVE-2026-11139: Policy bypass in Paint
  * CVE-2026-11140: Insufficient validation of untrusted input in Chromecast
  * CVE-2026-11141: Uninitialized Use in Audio
  * CVE-2026-11142: Policy bypass in Paint
  * CVE-2026-11143: Heap buffer overflow in Extensions
  * CVE-2026-11144: Use after free in Media
  * CVE-2026-11145: Race in Geolocation
  * CVE-2026-11146: Insufficient validation of untrusted input in Chromoting
  * CVE-2026-11147: Use after free in WebML
  * CVE-2026-11148: Inappropriate implementation in Payments
  * CVE-2026-11149: Insufficient validation of untrusted input in Extensions
  * CVE-2026-11150: Inappropriate implementation in XML
  * CVE-2026-11151: Insufficient validation of untrusted input in Password Manager
  * CVE-2026-11152: Object lifecycle issue in Dawn
  * CVE-2026-11153: Side-channel information leakage in Forms
  * CVE-2026-11154: Use after free in Dawn
  * CVE-2026-11155: Insufficient policy enforcement in CSS
  * CVE-2026-11156: Inappropriate implementation in CSS
  * CVE-2026-11157: Script injection in Accessibility
  * CVE-2026-11158: Insufficient validation of untrusted input in Downloads
  * CVE-2026-11159: Uninitialized Use in Skia
  * CVE-2026-11160: Out of bounds read in Input
  * CVE-2026-11161: Insufficient data validation in DataTransfer
  * CVE-2026-11162: Insufficient policy enforcement in CSS
  * CVE-2026-11163: Use after free in Messages
  * CVE-2026-11164: Use after free in Blink
  * CVE-2026-11165: Use after free in WebMIDI
  * CVE-2026-11166: Inappropriate implementation in SVG
  * CVE-2026-11167: Inappropriate implementation in WebView
  * CVE-2026-11168: Insufficient policy enforcement in Extensions
  * CVE-2026-11169: Inappropriate implementation in XML
  * CVE-2026-11170: Inappropriate implementation in Chromoting
  * CVE-2026-11171: Integer overflow in Blink
  * CVE-2026-11172: Incorrect security UI in Contact Picker
  * CVE-2026-11173: Out of bounds write in V8
  * CVE-2026-11174: Insufficient policy enforcement in Site Isolation
  * CVE-2026-11175: Incorrect security UI in Messages
  * CVE-2026-11176: Inappropriate implementation in Media
  * CVE-2026-11177: Use after free in Omnibox
  * CVE-2026-11178: Policy bypass in WebView
  * CVE-2026-11179: Inappropriate implementation in ORB
  * CVE-2026-11180: Policy bypass in SVG
  * CVE-2026-11181: Inappropriate implementation in Media Session
  * CVE-2026-11182: Inappropriate implementation in SVG
  * CVE-2026-11183: Out of bounds read in GWP-ASan
  * CVE-2026-11184: Insufficient policy enforcement in Actor
  * CVE-2026-11185: Use after free in V8
  * CVE-2026-11186: Inappropriate implementation in CSS
  * CVE-2026-11187: Insufficient policy enforcement in Glic
  * CVE-2026-11188: Use after free in USB
  * CVE-2026-11189: Insufficient validation of untrusted input in DevTools
  * CVE-2026-11190: Insufficient policy enforcement in Extensions
  * CVE-2026-11191: Out of bounds memory access in ANGLE
  * CVE-2026-11192: Insufficient validation of untrusted input in Password Manager
  * CVE-2026-11193: Insufficient policy enforcement in Password Manager
  * CVE-2026-11194: Inappropriate implementation in Network
  * CVE-2026-11195: Inappropriate implementation in MHTML
  * CVE-2026-11196: Type Confusion in XML
  * CVE-2026-11197: Insufficient policy enforcement in Workers
  * CVE-2026-11198: Insufficient validation of untrusted input in Codecs
  * CVE-2026-11199: Insufficient validation of untrusted input in WebRTC
  * CVE-2026-11200: Inappropriate implementation in WebRTC
  * CVE-2026-11201: Use after free in ServiceWorker
  * CVE-2026-11202: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-11203: Policy bypass in GPU
  * CVE-2026-11204: Inappropriate implementation in Signin
  * CVE-2026-11205: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-11206: Policy bypass in ServiceWorker
  * CVE-2026-11207: Insufficient validation of untrusted input in Autofill
  * CVE-2026-11208: Use after free in Codecs
  * CVE-2026-11209: Insufficient policy enforcement in Passwords
  * CVE-2026-11210: Insufficient policy enforcement in Safe Browsing
  * CVE-2026-11211: Integer overflow in V8
  * CVE-2026-11212: Insufficient policy enforcement in DevTools
  * CVE-2026-11213: Insufficient validation of untrusted input in Reading Mode
  * CVE-2026-11214: Inappropriate implementation in Chrome for iOS
  * CVE-2026-11215: Inappropriate implementation in Cronet
  * CVE-2026-11216: Incorrect security UI in File Input
  * CVE-2026-11217: Insufficient policy enforcement in Fenced Frames
  * CVE-2026-11218: Inappropriate implementation in PlatformIntegration
  * CVE-2026-11219: Insufficient data validation in Navigation
  * CVE-2026-11220: Insufficient validation of untrusted input in Navigation
  * CVE-2026-11221: Insufficient validation of untrusted input in PointerLock
  * CVE-2026-11222: Incorrect security UI in Tab Strip
  * CVE-2026-11223: Insufficient validation of untrusted input in Network
  * CVE-2026-11224: Use after free in Chromoting
  * CVE-2026-11225: Incorrect security UI in WebUI
  * CVE-2026-11226: Insufficient policy enforcement in PreviewTab
  * CVE-2026-11227: Incorrect security UI in Tab Hover Cards
  * CVE-2026-11228: Incorrect security UI in File Input
  * CVE-2026-11229: Insufficient policy enforcement in Enterprise
  * CVE-2026-11230: Use after free in Extensions
  * CVE-2026-11231: Inappropriate implementation in Safe Browsing
  * CVE-2026-11232: Inappropriate implementation in TabGroups
  * CVE-2026-11233: Insufficient validation of untrusted input in FoldableAPIs
  * CVE-2026-11234: Insufficient policy enforcement in FoldableAPIs
  * CVE-2026-11235: Insufficient validation of untrusted input in Compositing
  * CVE-2026-11236: Insufficient policy enforcement in Web Bluetooth
  * CVE-2026-11237: Insufficient validation of untrusted input in Media
  * CVE-2026-11238: Inappropriate implementation in DevTools
  * CVE-2026-11239: Insufficient validation of untrusted input in Extensions
  * CVE-2026-11240: Insufficient validation of untrusted input in Loader
  * CVE-2026-11241: Insufficient validation of untrusted input in Cast
  * CVE-2026-11242: Insufficient validation of untrusted input in Plugins
  * CVE-2026-11243: Incorrect security UI in Downloads
  * CVE-2026-11244: Insufficient validation of untrusted input in WebAuthentication
  * CVE-2026-11245: Inappropriate implementation in Payments
  * CVE-2026-11246: Insufficient validation of untrusted input in IndexedDB
  * CVE-2026-11247: Insufficient policy enforcement in CustomTabs
  * CVE-2026-11248: Policy bypass in Google Lens
  * CVE-2026-11249: Use after free in Network
  * CVE-2026-11250: Inappropriate implementation in DevTools
  * CVE-2026-11251: Insufficient validation of untrusted input in Password Manager
  * CVE-2026-11252: Policy bypass in Content Settings
  * CVE-2026-11253: Race in Permissions
  * CVE-2026-11254: Inappropriate implementation in Permissions
  * CVE-2026-11255: Insufficient validation of untrusted input in Storage Access API
  * CVE-2026-11256: Out of bounds read in GPU
  * CVE-2026-11257: Inappropriate implementation in Browser
  * CVE-2026-11258: Inappropriate implementation in File System Access
  * CVE-2026-11259: Insufficient validation of untrusted input in Cast
  * CVE-2026-11260: Policy bypass in Permissions
  * CVE-2026-11261: Insufficient validation of untrusted input in PDF
  * CVE-2026-11262: Use after free in TabStrip
  * CVE-2026-11263: Insufficient policy enforcement in WebAuthentication
  * CVE-2026-11264: Policy bypass in Content Security Policy
  * CVE-2026-11265: Insufficient data validation in Autofill
  * CVE-2026-11266: Policy bypass in SafeBrowsing
  * CVE-2026-11267: Insufficient policy enforcement in Extensions
  * CVE-2026-11268: Uninitialized Use in ANGLE
  * CVE-2026-11269: Inappropriate implementation in Extensions
  * CVE-2026-11270: Inappropriate implementation in UI
  * CVE-2026-11271: Incorrect security UI in Passwords
  * CVE-2026-11272: Insufficient validation of untrusted input in Reading List
  * CVE-2026-11273: Insufficient validation of untrusted input in Omnibox
  * CVE-2026-11274: Inappropriate implementation in DOM Distiller
  * CVE-2026-11275: Insufficient policy enforcement in Page Info
  * CVE-2026-11276: Inappropriate implementation in Cast
  * CVE-2026-11277: Insufficient policy enforcement in Chrome for iOS
  * CVE-2026-11278: Inappropriate implementation in CustomTabs
  * CVE-2026-11279: Out of bounds read in DevTools
  * CVE-2026-11280: Insufficient validation of untrusted input in Signin
  * CVE-2026-11281: Integer overflow in Chromoting
  * CVE-2026-11282: Policy bypass in Sandbox
  * CVE-2026-11283: Policy bypass in Shortcuts
  * CVE-2026-11284: Side-channel information leakage in PerformanceAPIs
  * CVE-2026-11285: Insufficient policy enforcement in Chrome for iOS
  * CVE-2026-11286: Insufficient validation of untrusted input in Wallet
  * CVE-2026-11287: Insufficient validation of untrusted input in Navigation
  * CVE-2026-11288: Policy bypass in CSS
  * CVE-2026-11289: Side-channel information leakage in Paint
  * CVE-2026-11290: Integer overflow in WebView
  * CVE-2026-11291: Policy bypass in Android Autofill
  * CVE-2026-11292: Policy bypass in Blink
  * CVE-2026-11293: Use after free in Input
  * CVE-2026-11294: Inappropriate implementation in Passwords
  * CVE-2026-11295: Inappropriate implementation in WebView
  * CVE-2026-11296: Inappropriate implementation in ImageCapture
  * CVE-2026-11297: Insufficient validation of untrusted input in Reader Mode
  * CVE-2026-11298: Insufficient policy enforcement in Chrome for iOS
  * CVE-2026-11299: Out of bounds read in Fonts
  * CVE-2026-11300: Inappropriate implementation in Permissions
  * CVE-2026-11301: Out of bounds read in LiveCaption
  * CVE-2026-11302: Insufficient policy enforcement in Chrome for iOS
  * CVE-2026-11303: Use after free in PDFium
  * CVE-2026-11304: Use after free in PDFium
  * CVE-2026-11305: Use after free in PDFium
  * CVE-2026-11306: Use after free in PDFium
  * CVE-2026-11307: Use after free in PDFium
  * CVE-2026-11308: Inappropriate implementation in Extensions
  * CVE-2026-11309: Insufficient policy enforcement in History
- Refresh ppc64le patches
- Refresh rustc and clang patches
- Include chrome-management-service
- Remove obsoletes SYS_SECCOMP patch
- Remove widevine-on-arm64 patch, it's merged in upstream
- Fix hardcoded path in remoting code

---
diff --git a/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch b/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch
index 62b5c3c..9653472 100644
--- a/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch
+++ b/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch
@@ -1,7 +1,7 @@
-Index: chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
+Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
++++ chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
 @@ -0,0 +1,101 @@
 +;
 +; Copyright (c) 2026, Alliance for Open Media. All rights reserved.
@@ -104,10 +104,10 @@ Index: chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/confi
 +HAVE_VSX equ 1
 +HAVE_WXWIDGETS equ 0
 +STATIC_LINK_JXL equ 0
-Index: chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
+Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
++++ chromium-149.0.7827.53/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.
@@ -122,10 +122,10 @@ Index: chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/confi
 +#include "aom/aom_codec.h"
 +static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/ppc-linux-gcc.cmake\" -DCONFIG_AV1_DECODER=0 -DCONFIG_AV1_ENCODER=1 -DCONFIG_SVT_AV1=0 -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-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
+Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
++++ chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
 @@ -0,0 +1,104 @@
 +/*
 + * Copyright (c) 2026, Alliance for Open Media. All rights reserved.
@@ -231,10 +231,10 @@ Index: chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/confi
 +#define HAVE_WXWIDGETS 0
 +#define STATIC_LINK_JXL 0
 +#endif  // AOM_CONFIG_H_
-Index: chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
+Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
++++ chromium-149.0.7827.53/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.
@@ -1413,10 +1413,10 @@ Index: chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/confi
 +#endif
 +
 +#endif  // AOM_DSP_RTCD_H_
-Index: chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
+Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
++++ chromium-149.0.7827.53/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.
@@ -1506,10 +1506,10 @@ Index: chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/confi
 +#endif
 +
 +#endif  // AOM_SCALE_RTCD_H_
-Index: chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
+Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
++++ chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
 @@ -0,0 +1,402 @@
 +/*
 + * Copyright (c) 2017, Alliance for Open Media. All rights reserved.

diff --git a/0002-regenerate-xnn-buildgn.patch b/0002-regenerate-xnn-buildgn.patch
index efa2e87..f54c078 100644
--- a/0002-regenerate-xnn-buildgn.patch
+++ b/0002-regenerate-xnn-buildgn.patch
@@ -7,11 +7,10 @@ This causes various toolchain failures of the form:
 While resolving toolchains for target @@rules_python+//python:current_py_toolchain
 	@@bazel_tools//tools/python:toolchain_type
 
-Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
-===================================================================
---- chromium-148.0.7778.96.orig/third_party/xnnpack/BUILD.gn
-+++ chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
-@@ -34,10 +34,10 @@ config("xnnpack_public_config") {
+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 @@
    }
  
    defines = [
@@ -26,7 +25,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  }
  
  config("xnnpack_private_config") {
-@@ -48,1948 +48,2218 @@ config("xnnpack_private_config") {
+@@ -48,1990 +48,2292 @@
    ]
  }
  
@@ -35,6 +34,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +  if (build_with_chromium) {
 +    xnnpack_deps = [
++    ":bf16-f32-vcvt_x64",
++    ":bf16-qs8-vcvt_x64",
++    ":bf16-rminmax_x64",
 +    ":configs_x64",
 +    ":enums_x64",
 +    ":f16-avgpool_f16c-no-avx2-no-fma",
@@ -92,6 +94,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ":f32-avgpool_avx512f",
 +    ":f32-avgpool_sse2-no-sse3",
 +    ":f32-avgpool_x64",
++    ":f32-bf16-vcvt_x64",
 +    ":f32-conv-hwc2chw_sse-no-sse2",
 +    ":f32-conv-hwc2chw_x64",
 +    ":f32-dwconv2d-chw_sse-no-sse2",
@@ -566,6 +569,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +  if (build_with_internal_optimization_guide) {
 +    xnnpack_standalone_deps = [
++    ":bf16-f32-vcvt_x64_standalone",
++    ":bf16-qs8-vcvt_x64_standalone",
++    ":bf16-rminmax_x64_standalone",
 +    ":configs_x64_standalone",
 +    ":enums_x64_standalone",
 +    ":f16-avgpool_f16c-no-avx2-no-fma_standalone",
@@ -623,6 +629,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ":f32-avgpool_avx512f_standalone",
 +    ":f32-avgpool_sse2-no-sse3_standalone",
 +    ":f32-avgpool_x64_standalone",
++    ":f32-bf16-vcvt_x64_standalone",
 +    ":f32-conv-hwc2chw_sse-no-sse2_standalone",
 +    ":f32-conv-hwc2chw_x64_standalone",
 +    ":f32-dwconv2d-chw_sse-no-sse2_standalone",
@@ -1099,6 +1106,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
    if (build_with_chromium) {
      xnnpack_deps = [
+-      ":bf16-f32-vcvt_x64",
+-      ":bf16-qs8-vcvt_x64",
+-      ":bf16-rminmax_x64",
 -      ":configs_x64",
 -      ":enums_x64",
 -      ":f16-avgpool_f16c-no-avx2-no-fma",
@@ -1156,6 +1166,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f32-avgpool_avx512f",
 -      ":f32-avgpool_sse2-no-sse3",
 -      ":f32-avgpool_x64",
+-      ":f32-bf16-vcvt_x64",
 -      ":f32-conv-hwc2chw_sse-no-sse2",
 -      ":f32-conv-hwc2chw_x64",
 -      ":f32-dwconv2d-chw_sse-no-sse2",
@@ -1625,6 +1636,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":xx-pad_sse2-no-sse3",
 -      ":xx-pad_x64",
 -      ":xx-transposev_x64",
++    ":bf16-f32-vcvt_arm64",
++    ":bf16-qs8-vcvt_arm64",
++    ":bf16-rminmax_arm64",
 +    ":configs_arm64",
 +    ":enums_arm64",
 +    ":f16-avgpool_arch=armv8.2-a+fp16",
@@ -1677,6 +1691,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ":f16-vunary_arch=armv8.2-a+fp16",
 +    ":f32-argmaxpool_arm64",
 +    ":f32-avgpool_arm64",
++    ":f32-bf16-vcvt_arch=armv8.2-a+bf16",
++    ":f32-bf16-vcvt_arm64",
 +    ":f32-conv-hwc2chw_arm64",
 +    ":f32-dwconv2d-chw_arm64",
 +    ":f32-dwconv_arch=armv8.2-a+fp16+dotprod",
@@ -1855,6 +1871,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
    if (build_with_internal_optimization_guide) {
      xnnpack_standalone_deps = [
+-      ":bf16-f32-vcvt_x64_standalone",
+-      ":bf16-qs8-vcvt_x64_standalone",
+-      ":bf16-rminmax_x64_standalone",
 -      ":configs_x64_standalone",
 -      ":enums_x64_standalone",
 -      ":f16-avgpool_f16c-no-avx2-no-fma_standalone",
@@ -1912,6 +1931,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f32-avgpool_avx512f_standalone",
 -      ":f32-avgpool_sse2-no-sse3_standalone",
 -      ":f32-avgpool_x64_standalone",
+-      ":f32-bf16-vcvt_x64_standalone",
 -      ":f32-conv-hwc2chw_sse-no-sse2_standalone",
 -      ":f32-conv-hwc2chw_x64_standalone",
 -      ":f32-dwconv2d-chw_sse-no-sse2_standalone",
@@ -2381,6 +2401,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":xx-pad_sse2-no-sse3_standalone",
 -      ":xx-pad_x64_standalone",
 -      ":xx-transposev_x64_standalone",
++    ":bf16-f32-vcvt_arm64_standalone",
++    ":bf16-qs8-vcvt_arm64_standalone",
++    ":bf16-rminmax_arm64_standalone",
 +    ":configs_arm64_standalone",
 +    ":enums_arm64_standalone",
 +    ":f16-avgpool_arch=armv8.2-a+fp16_standalone",
@@ -2433,6 +2456,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ":f16-vunary_arch=armv8.2-a+fp16_standalone",
 +    ":f32-argmaxpool_arm64_standalone",
 +    ":f32-avgpool_arm64_standalone",
++    ":f32-bf16-vcvt_arch=armv8.2-a+bf16_standalone",
++    ":f32-bf16-vcvt_arm64_standalone",
 +    ":f32-conv-hwc2chw_arm64_standalone",
 +    ":f32-dwconv2d-chw_arm64_standalone",
 +    ":f32-dwconv_arch=armv8.2-a+fp16+dotprod_standalone",
@@ -2614,6 +2639,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
    if (build_with_chromium) {
      xnnpack_deps = [
+-      ":bf16-f32-vcvt_arm64",
+-      ":bf16-qs8-vcvt_arm64",
+-      ":bf16-rminmax_arm64",
 -      ":configs_arm64",
 -      ":enums_arm64",
 -      ":f16-avgpool_arch=armv8.2-a+fp16",
@@ -2666,6 +2694,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f16-vunary_arch=armv8.2-a+fp16",
 -      ":f32-argmaxpool_arm64",
 -      ":f32-avgpool_arm64",
+-      ":f32-bf16-vcvt_arch=armv8.2-a+bf16",
+-      ":f32-bf16-vcvt_arm64",
 -      ":f32-conv-hwc2chw_arm64",
 -      ":f32-dwconv2d-chw_arm64",
 -      ":f32-dwconv_arch=armv8.2-a+fp16+dotprod",
@@ -2839,8 +2869,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":xx-fill_arm64",
 -      ":xx-pad_arm64",
 -      ":xx-transposev_arm64",
++    ":bf16-f32-vcvt_riscv64",
++    ":bf16-qs8-vcvt_riscv64",
++    ":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",
@@ -2850,8 +2884,10 @@ Index: chromium-148.0.7778.96/third_party/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",
 +    ":f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-rdminmax_riscv64",
 +    ":f16-rminmax_arch=rv64gc_zvfh-abi=lp64d",
@@ -2863,11 +2899,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ":f16-vcos_riscv64",
 +    ":f16-vexp_riscv64",
 +    ":f16-vgelu_riscv64",
++    ":f16-vhswish_arch=rv64gc_zvfh-abi=lp64d",
++    ":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-vsin_riscv64",
++    ":f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d",
 +    ":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",
 +    ":f32-conv-hwc2chw_riscv64",
 +    ":f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d",
@@ -2913,25 +2957,33 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ":f32-vclamp_riscv64",
 +    ":f32-vcmul_arch=rv64gcv-abi=lp64d",
 +    ":f32-vcmul_riscv64",
++    ":f32-vcopysign_arch=rv64gcv-abi=lp64d",
 +    ":f32-vcopysign_riscv64",
++    ":f32-vcos_arch=rv64gcv-abi=lp64d",
 +    ":f32-vcos_riscv64",
 +    ":f32-velu_riscv64",
++    ":f32-vexp_arch=rv64gcv-abi=lp64d",
 +    ":f32-vexp_riscv64",
 +    ":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",
++    ":f32-vmulcaddc_arch=rv64gcv-abi=lp64d",
 +    ":f32-vmulcaddc_riscv64",
 +    ":f32-vrnd_arch=rv64gcv-abi=lp64d",
 +    ":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",
@@ -3010,6 +3062,7 @@ Index: chromium-148.0.7778.96/third_party/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",
@@ -3021,6 +3074,7 @@ Index: chromium-148.0.7778.96/third_party/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",
@@ -3050,6 +3104,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
    if (build_with_internal_optimization_guide) {
      xnnpack_standalone_deps = [
+-      ":bf16-f32-vcvt_arm64_standalone",
+-      ":bf16-qs8-vcvt_arm64_standalone",
+-      ":bf16-rminmax_arm64_standalone",
 -      ":configs_arm64_standalone",
 -      ":enums_arm64_standalone",
 -      ":f16-avgpool_arch=armv8.2-a+fp16_standalone",
@@ -3102,6 +3159,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f16-vunary_arch=armv8.2-a+fp16_standalone",
 -      ":f32-argmaxpool_arm64_standalone",
 -      ":f32-avgpool_arm64_standalone",
+-      ":f32-bf16-vcvt_arch=armv8.2-a+bf16_standalone",
+-      ":f32-bf16-vcvt_arm64_standalone",
 -      ":f32-conv-hwc2chw_arm64_standalone",
 -      ":f32-dwconv2d-chw_arm64_standalone",
 -      ":f32-dwconv_arch=armv8.2-a+fp16+dotprod_standalone",
@@ -3275,8 +3334,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":xx-fill_arm64_standalone",
 -      ":xx-pad_arm64_standalone",
 -      ":xx-transposev_arm64_standalone",
++    ":bf16-f32-vcvt_riscv64_standalone",
++    ":bf16-qs8-vcvt_riscv64_standalone",
++    ":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",
@@ -3286,8 +3349,10 @@ Index: chromium-148.0.7778.96/third_party/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",
 +    ":f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-rdminmax_riscv64_standalone",
 +    ":f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone",
@@ -3299,11 +3364,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ":f16-vcos_riscv64_standalone",
 +    ":f16-vexp_riscv64_standalone",
 +    ":f16-vgelu_riscv64_standalone",
++    ":f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_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-vsin_riscv64_standalone",
++    ":f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_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",
 +    ":f32-conv-hwc2chw_riscv64_standalone",
 +    ":f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone",
@@ -3349,25 +3422,33 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ":f32-vclamp_riscv64_standalone",
 +    ":f32-vcmul_arch=rv64gcv-abi=lp64d_standalone",
 +    ":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_riscv64_standalone",
++    ":f32-vexp_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-vexp_riscv64_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",
++    ":f32-vmulcaddc_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-vmulcaddc_riscv64_standalone",
 +    ":f32-vrnd_arch=rv64gcv-abi=lp64d_standalone",
 +    ":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",
@@ -3446,6 +3527,7 @@ Index: chromium-148.0.7778.96/third_party/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",
@@ -3457,6 +3539,7 @@ Index: chromium-148.0.7778.96/third_party/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",
@@ -3489,6 +3572,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
    if (build_with_chromium) {
      xnnpack_deps = [
+-      ":bf16-f32-vcvt_riscv64",
+-      ":bf16-qs8-vcvt_riscv64",
+-      ":bf16-rminmax_riscv64",
 -      ":configs_riscv64",
 -      ":enums_riscv64",
 -      ":f16-dwconv_arch=rv64gc_zvfh-abi=lp64d",
@@ -3502,6 +3588,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f16-igemm_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-qs8-vcvt_riscv64",
 -      ":f16-qu8-vcvt_riscv64",
+-      ":f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-rdminmax_riscv64",
 -      ":f16-rminmax_arch=rv64gc_zvfh-abi=lp64d",
@@ -3513,11 +3600,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f16-vcos_riscv64",
 -      ":f16-vexp_riscv64",
 -      ":f16-vgelu_riscv64",
+-      ":f16-vhswish_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vrnd_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vsin_riscv64",
+-      ":f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vunary_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f32-argmaxpool_arch=rv64gcv-abi=lp64d",
 -      ":f32-argmaxpool_riscv64",
 -      ":f32-avgpool_riscv64",
+-      ":f32-bf16-vcvt_riscv64",
 -      ":f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d",
 -      ":f32-conv-hwc2chw_riscv64",
 -      ":f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d",
@@ -3563,6 +3656,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f32-vclamp_riscv64",
 -      ":f32-vcmul_arch=rv64gcv-abi=lp64d",
 -      ":f32-vcmul_riscv64",
+-      ":f32-vcopysign_arch=rv64gcv-abi=lp64d",
 -      ":f32-vcopysign_riscv64",
 -      ":f32-vcos_riscv64",
 -      ":f32-velu_riscv64",
@@ -3573,6 +3667,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f32-vlog_riscv64",
 -      ":f32-vlrelu_arch=rv64gcv-abi=lp64d",
 -      ":f32-vlrelu_riscv64",
+-      ":f32-vmulcaddc_arch=rv64gcv-abi=lp64d",
 -      ":f32-vmulcaddc_riscv64",
 -      ":f32-vrnd_arch=rv64gcv-abi=lp64d",
 -      ":f32-vrnd_riscv64",
@@ -3695,6 +3790,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":xx-fill_riscv64",
 -      ":xx-pad_riscv64",
 -      ":xx-transposev_riscv64",
++    ":bf16-f32-vcvt_ppc64",
++    ":bf16-qs8-vcvt_ppc64",
++    ":bf16-rminmax_ppc64",
 +    ":configs_ppc64",
 +    ":enums_ppc64",
 +    ":f16-f32-vcvt_ppc64",
@@ -3709,6 +3807,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ":f16-vsin_ppc64",
 +    ":f32-argmaxpool_ppc64",
 +    ":f32-avgpool_ppc64",
++    ":f32-bf16-vcvt_ppc64",
 +    ":f32-conv-hwc2chw_ppc64",
 +    ":f32-dwconv2d-chw_ppc64",
 +    ":f32-dwconv_ppc64",
@@ -3826,6 +3925,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
    if (build_with_internal_optimization_guide) {
      xnnpack_standalone_deps = [
+-      ":bf16-f32-vcvt_riscv64_standalone",
+-      ":bf16-qs8-vcvt_riscv64_standalone",
+-      ":bf16-rminmax_riscv64_standalone",
 -      ":configs_riscv64_standalone",
 -      ":enums_riscv64_standalone",
 -      ":f16-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone",
@@ -3839,6 +3941,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f16-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-qs8-vcvt_riscv64_standalone",
 -      ":f16-qu8-vcvt_riscv64_standalone",
+-      ":f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-rdminmax_riscv64_standalone",
 -      ":f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone",
@@ -3850,11 +3953,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f16-vcos_riscv64_standalone",
 -      ":f16-vexp_riscv64_standalone",
 -      ":f16-vgelu_riscv64_standalone",
+-      ":f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vsin_riscv64_standalone",
+-      ":f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-argmaxpool_riscv64_standalone",
 -      ":f32-avgpool_riscv64_standalone",
+-      ":f32-bf16-vcvt_riscv64_standalone",
 -      ":f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-conv-hwc2chw_riscv64_standalone",
 -      ":f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone",
@@ -3900,6 +4009,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f32-vclamp_riscv64_standalone",
 -      ":f32-vcmul_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vcmul_riscv64_standalone",
+-      ":f32-vcopysign_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vcopysign_riscv64_standalone",
 -      ":f32-vcos_riscv64_standalone",
 -      ":f32-velu_riscv64_standalone",
@@ -3910,6 +4020,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":f32-vlog_riscv64_standalone",
 -      ":f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vlrelu_riscv64_standalone",
+-      ":f32-vmulcaddc_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vmulcaddc_riscv64_standalone",
 -      ":f32-vrnd_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vrnd_riscv64_standalone",
@@ -4032,6 +4143,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ":xx-fill_riscv64_standalone",
 -      ":xx-pad_riscv64_standalone",
 -      ":xx-transposev_riscv64_standalone",
++    ":bf16-f32-vcvt_ppc64_standalone",
++    ":bf16-qs8-vcvt_ppc64_standalone",
++    ":bf16-rminmax_ppc64_standalone",
 +    ":configs_ppc64_standalone",
 +    ":enums_ppc64_standalone",
 +    ":f16-f32-vcvt_ppc64_standalone",
@@ -4046,6 +4160,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ":f16-vsin_ppc64_standalone",
 +    ":f32-argmaxpool_ppc64_standalone",
 +    ":f32-avgpool_ppc64_standalone",
++    ":f32-bf16-vcvt_ppc64_standalone",
 +    ":f32-conv-hwc2chw_ppc64_standalone",
 +    ":f32-dwconv2d-chw_ppc64_standalone",
 +    ":f32-dwconv_ppc64_standalone",
@@ -4161,7 +4276,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
      ]
    }
  } else {
-@@ -1999,6 +2269,7 @@ if (current_cpu == "x64" || current_cpu
+@@ -2041,6 +2343,7 @@
    }
  }
  
@@ -4169,7 +4284,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  if (build_with_chromium) {
    source_set("xnnpack") {
      public = [ "src/include/xnnpack.h" ]
-@@ -2009,38 +2280,38 @@ if (build_with_chromium) {
+@@ -2051,38 +2354,38 @@
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4236,7 +4351,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
    }
-@@ -2057,38 +2328,38 @@ if (build_with_internal_optimization_gui
+@@ -2099,38 +2402,38 @@
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4303,11 +4418,275 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
  
-@@ -2099,59715 +2370,69468 @@ if (build_with_internal_optimization_gui
+@@ -2141,60925 +2444,71699 @@
  }
  
  if (current_cpu == "x64" || current_cpu == "x86") {
 -  if (build_with_chromium) {
+-    source_set("bf16-f32-vcvt_x64") {
+-      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",
+-      ]
++if (build_with_chromium) {
++  source_set("bf16-f32-vcvt_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("bf16-f32-vcvt_x64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      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" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("bf16-qs8-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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("bf16-qs8-vcvt_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("bf16-qs8-vcvt_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++    ]
+ 
+-      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" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("bf16-rminmax_x64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-qs8-vcvt_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-qs8-vcvt/gen/bf16-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",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("bf16-rminmax_x64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/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("configs_x64") {
 -      cflags = []
 -
@@ -4351,37 +4730,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("configs_x64") {
++  source_set("bf16-rminmax_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/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" ]
@@ -4458,37 +4816,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("configs_x64_standalone") {
++  source_set("bf16-rminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -4589,18 +4926,37 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("enums_x64") {
++  source_set("configs_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/enums/allocation-type.c",
-+    "src/src/enums/datatype-strings.c",
-+    "src/src/enums/microkernel-type.c",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
++      "src/src/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -4683,18 +5039,37 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("enums_x64_standalone") {
++  source_set("configs_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/enums/allocation-type.c",
-+    "src/src/enums/datatype-strings.c",
-+    "src/src/enums/microkernel-type.c",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
++      "src/src/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -4817,16 +5192,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-avgpool_f16c-no-avx2-no-fma") {
++  source_set("enums_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
++      "src/src/enums/allocation-type.c",
++    "src/src/enums/datatype-strings.c",
++    "src/src/enums/microkernel-type.c",
++    "src/src/enums/node-type.c",
++    "src/src/enums/operator-type.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -4940,16 +5317,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-avgpool_f16c-no-avx2-no-fma_standalone") {
++  source_set("enums_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
++      "src/src/enums/allocation-type.c",
++    "src/src/enums/datatype-strings.c",
++    "src/src/enums/microkernel-type.c",
++    "src/src/enums/node-type.c",
++    "src/src/enums/operator-type.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -5065,19 +5444,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_f16c-fma-no-avx2") {
++  source_set("f16-avgpool_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-fma3-acc2.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-fma3.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-fma3.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-fma3.c"
++      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -5158,19 +5534,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-dwconv_f16c-fma-no-avx2_standalone") {
++  source_set("f16-avgpool_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-fma3-acc2.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-fma3.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-fma3.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-fma3.c"
++      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
 +    ]
  
 -      sources = [
@@ -5238,17 +5611,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f16-dwconv_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
++      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-fma3-acc2.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-fma3.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-fma3.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-fma3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -5355,17 +5730,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f16-dwconv_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
++      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-fma3-acc2.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-fma3.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-fma3.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-fma3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -5494,20 +5871,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -5616,20 +5990,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -5752,16 +6123,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_f16c-no-avx2-no-fma") {
++  source_set("f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -5875,16 +6250,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -6012,15 +6391,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_sse2-no-sse3") {
++  source_set("f16-f32-vcvt_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -6124,15 +6504,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_sse2-no-sse3_standalone") {
++  source_set("f16-f32-vcvt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -6250,15 +6631,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_sse4.1-no-sse4.2") {
++  source_set("f16-f32-vcvt_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -6349,15 +6730,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("f16-f32-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c"
 +    ]
  
 -      deps = [
@@ -6424,14 +6805,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_x64") {
++  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-scalar-u4.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6468,7 +6850,142 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_x64_standalone") {
++  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"
++    ]
+ 
+-      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" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-rdminmax_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
+-        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-f32-vcvt_x64") {
 +    cflags = [
 +  
 +    ]
@@ -6478,166 +6995,29 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-rdminmax_x64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-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" ]
--      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f16-rdminmax_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
--        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      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"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-rdminmax_x64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
--        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.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" ]
@@ -6695,17 +7075,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-gemm_f16c-fma-avx2_standalone") {
++  source_set("f16-f32-vcvt_x64_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"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -6850,7 +7227,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-igemm_f16c-fma-avx2") {
++  source_set("f16-f32acc-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -6859,8 +7236,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c"
++      "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x16-minmax-avx2-broadcast.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -6941,9 +7318,21 @@ Index: chromium-148.0.7778.96/third_party/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-igemm_f16c-fma-avx2_standalone") {
++  source_set("f16-f32acc-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -6952,25 +7341,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c"
++      "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x16-minmax-avx2-broadcast.c"
 +    ]
  
--      sources = [
--        "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",
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -6978,41 +7366,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-rminmax_x64_standalone") {
 -      cflags = []
-+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" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -7038,94 +7396,63 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-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",
 -      ]
-+    public_configs = [ ":xnnpack_public_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" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_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_x64_standalone") {
 -      cflags = []
-+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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -7151,11 +7478,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -7207,18 +7532,28 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-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"
 +    ]
  
 -      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) {
@@ -7279,18 +7614,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  if (build_with_chromium) {
@@ -7335,20 +7663,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -7399,13 +7721,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("f16-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"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-vclamp_f16c-no-avx2-no-fma") {
@@ -7431,31 +7764,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+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" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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-vclamp_f16c-no-avx2-no-fma_standalone") {
@@ -7488,13 +7811,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -7504,7 +7820,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -7517,7 +7833,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
 +    ]
  
 -      sources = [
@@ -7585,7 +7901,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
++  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -7594,7 +7910,7 @@ Index: chromium-148.0.7778.96/third_party/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-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -7675,9 +7991,19 @@ Index: chromium-148.0.7778.96/third_party/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-rdsum_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -7686,22 +8012,23 @@ Index: chromium-148.0.7778.96/third_party/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-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.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",
@@ -7709,41 +8036,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vexp_x64_standalone") {
 -      cflags = []
-+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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -7767,29 +8064,34 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vgelu_x64") {
 -      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") {
+-
+-      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") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -7802,59 +8104,26 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
--      ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vgelu_x64_standalone") {
 -      cflags = []
-+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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -7880,11 +8149,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vhswish_f16c-no-avx2-no-fma") {
@@ -7910,18 +8177,31 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-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"
 +    ]
  
 -      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) {
@@ -7956,18 +8236,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  if (build_with_chromium) {
@@ -7994,20 +8267,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -8040,13 +8307,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("f16-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 (build_with_chromium) {
 -    source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
@@ -8072,31 +8346,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+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"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") {
@@ -8129,13 +8393,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -8169,20 +8426,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -8303,16 +8556,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma") {
++  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -8395,16 +8652,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
 +    ]
  
 -      sources = [
@@ -8447,16 +8708,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vsin_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear_f16c-fma-no-avx2") {
++  source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
 +    ]
  
 -      sources = [
@@ -8560,16 +8821,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-ibilinear_f16c-fma-no-avx2_standalone") {
++  source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -8675,16 +8936,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_f16c-fma-avx2") {
++  source_set("f16-f32acc-rsum_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-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -8764,16 +9029,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-maxpool_f16c-fma-avx2_standalone") {
++  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -8891,15 +9160,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_sse4.1-no-sse4.2") {
++  source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -8980,15 +9250,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-maxpool_sse4.1-no-sse4.2_standalone") {
++  source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
 +    ]
  
 -      sources = [
@@ -9056,14 +9327,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_x64") {
++  source_set("f16-ibilinear_f16c-fma-no-avx2") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -9148,14 +9421,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_x64_standalone") {
++  source_set("f16-ibilinear_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
 +    ]
  
 -      sources = [
@@ -9223,14 +9498,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_x64") {
++  source_set("f16-maxpool_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -9311,172 +9588,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qu8-vcvt_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-avgpool_x64_standalone") {
--      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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/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_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("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-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
++  source_set("f16-maxpool_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -9485,12 +9597,281 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/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-avgpool_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/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      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-bf16-vcvt_x64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-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("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",
++      "//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-bf16-vcvt_x64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  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",
+-      ]
++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"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-conv-hwc2chw_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" ]
+-      }
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-conv-hwc2chw_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/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -9528,15 +9909,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-conv-hwc2chw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_x64") {
++  source_set("f16-qu8-vcvt_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -9644,15 +10024,14 @@ Index: chromium-148.0.7778.96/third_party/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-qu8-vcvt_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -9735,28 +10114,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-dwconv2d-chw_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512skx-u64-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512skx-u64-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-acc4.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
 +    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -9781,15 +10149,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -9800,22 +10173,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512skx-u64-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512skx-u64-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-acc4.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
 +    ]
  
 -      sources = [
@@ -9959,25 +10326,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-rdminmax_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -10058,25 +10415,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-rdminmax_x64_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"
++      "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" ]
@@ -10201,16 +10548,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_f16c-no-avx2-no-fma") {
++  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
++      "src/src/f16-rminmax/gen/f16-rmax-avx512skx-u64-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512skx-u64-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-acc4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -10265,16 +10618,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/f16-rmax-f16c-u32.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 = [
@@ -10420,16 +10779,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_x64") {
++  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -10514,16 +10882,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_x64_standalone") {
++  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -10639,14 +11016,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_x64") {
++  source_set("f16-rminmax_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -10727,14 +11106,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_x64_standalone") {
++  source_set("f16-rminmax_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
 +    ]
  
 -      sources = [
@@ -10777,41 +11158,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-f16-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-rminmax_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -10923,41 +11279,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-rminmax_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -11008,34 +11339,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-gemm_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_f16c-no-avx2-no-fma") {
++  source_set("f16-vapproxgelu_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -11158,34 +11469,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vapproxgelu_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -11272,16 +11563,41 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-gemm_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_f16c-no-avx2-no-fma") {
++  source_set("f16-vbinary_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11292,12 +11608,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c",
 -      ]
 -
@@ -11331,27 +11645,50 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vclamp_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vbinary_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-vbinary/gen/f16-vadd-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c",
 -      ]
 -
@@ -11459,14 +11796,34 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vcos_x64") {
++  source_set("f16-vbinary_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11503,14 +11860,34 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_x64_standalone") {
++  source_set("f16-vbinary_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-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 = [
@@ -11622,16 +11999,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-velu_f16c-fma-avx2") {
++  source_set("f16-vclamp_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-vclamp/gen/f16-vclamp-f16c-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11668,16 +12045,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-velu_f16c-fma-avx2_standalone") {
++  source_set("f16-vclamp_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-vclamp/gen/f16-vclamp-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -11794,14 +12171,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_avx512f") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vexp_x64") {
++  source_set("f16-vcos_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11847,14 +12224,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_x64_standalone") {
++  source_set("f16-vcos_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -12002,14 +12379,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_x64") {
++  source_set("f16-velu_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -12069,25 +12448,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_x64_standalone") {
++  source_set("f16-velu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.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-relu-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c",
 -      ]
 -
@@ -12126,12 +12505,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c",
 -      ]
 -
@@ -12182,16 +12559,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_f16c-no-avx2-no-fma") {
++  source_set("f16-vexp_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -12249,16 +12624,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vhswish_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vexp_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -      sources = [
@@ -12326,16 +12699,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_f16c-no-avx2-no-fma") {
++  source_set("f16-vgelu_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -12444,16 +12815,14 @@ Index: chromium-148.0.7778.96/third_party/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-vgelu_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -12574,16 +12943,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
++  source_set("f16-vhswish_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -12666,16 +13035,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") {
++  source_set("f16-vhswish_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -12745,7 +13114,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_f16c-no-avx2-no-fma") {
++  source_set("f16-vlrelu_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -12754,10 +13123,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -12866,7 +13232,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vrnd_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vlrelu_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -12875,10 +13241,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13013,16 +13376,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_f16c-no-avx2-no-fma") {
++  source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
 +    cflags = [
 +      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -13128,16 +13491,16 @@ Index: chromium-148.0.7778.96/third_party/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-vmulcaddc_f16c-fma-no-avx2_standalone") {
 +    cflags = [
 +      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13204,16 +13567,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_f16c-fma-avx2") {
++  source_set("f16-vrnd_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
++      "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -13250,16 +13616,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsigmoid_f16c-fma-avx2_standalone") {
++  source_set("f16-vrnd_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
++      "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -13392,14 +13761,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsin_x64") {
++  source_set("f16-vrsqrt_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-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13484,14 +13855,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_x64_standalone") {
++  source_set("f16-vrsqrt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13612,16 +13985,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_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-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -13702,16 +14075,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsqrt_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vsigmoid_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
 +    ]
  
 -      sources = [
@@ -13781,16 +14154,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_f16c-fma-no-avx2") {
++  source_set("f16-vsin_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-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -13896,16 +14267,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_f16c-fma-no-avx2_standalone") {
++  source_set("f16-vsin_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-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -14033,7 +14402,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_f16c-no-avx2-no-fma") {
++  source_set("f16-vsqrt_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -14042,7 +14411,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14123,7 +14492,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vsqrt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -14132,7 +14501,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      sources = [
@@ -14176,16 +14545,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-qu8-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vunary_f16c-no-avx2-no-fma") {
++  source_set("f16-vtanh_f16c-fma-no-avx2") {
 +    cflags = [
 +      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.c"
 +    ]
  
 -      sources = [
@@ -14233,16 +14602,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vtanh_f16c-fma-no-avx2_standalone") {
 +    cflags = [
 +      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.c"
 +    ]
  
 -      sources = [
@@ -14285,16 +14654,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vunary_sse2-no-sse3") {
++  source_set("f16-vtanh_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
-+    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c"
 +    ]
  
 -      sources = [
@@ -14398,16 +14767,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vunary_sse2-no-sse3_standalone") {
++  source_set("f16-vtanh_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
-+    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14522,15 +14891,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_sse2-no-sse3") {
++  source_set("f16-vunary_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
++      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -14588,15 +14958,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_sse2-no-sse3_standalone") {
++  source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
++      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -14664,14 +15035,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_x64") {
++  source_set("f16-vunary_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14758,14 +15131,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_x64_standalone") {
++  source_set("f16-vunary_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
 +    ]
  
 -      sources = [
@@ -14835,17 +15210,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-argmaxpool_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14928,17 +15301,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-argmaxpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
 +    ]
  
 -      sources = [
@@ -15008,14 +15379,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_avx512f") {
++  source_set("f32-argmaxpool_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15100,14 +15471,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_avx512f_standalone") {
++  source_set("f32-argmaxpool_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      sources = [
@@ -15175,15 +15546,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_sse2-no-sse3") {
++  source_set("f32-avgpool_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-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15264,15 +15637,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_sse2-no-sse3_standalone") {
++  source_set("f32-avgpool_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-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
 +    ]
  
 -      sources = [
@@ -15340,14 +15715,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_x64") {
++  source_set("f32-avgpool_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15432,14 +15807,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_x64_standalone") {
++  source_set("f32-avgpool_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
 +    ]
  
 -      sources = [
@@ -15507,15 +15882,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_sse-no-sse2") {
++  source_set("f32-avgpool_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15596,15 +15971,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_sse-no-sse2_standalone") {
++  source_set("f32-avgpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
 +    ]
  
 -      sources = [
@@ -15672,14 +16047,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_x64") {
++  source_set("f32-avgpool_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15768,14 +16143,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_x64_standalone") {
++  source_set("f32-avgpool_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -15847,18 +16222,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_sse-no-sse2") {
++  source_set("f32-bf16-vcvt_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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15943,18 +16314,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_sse-no-sse2_standalone") {
++  source_set("f32-bf16-vcvt_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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -16026,15 +16393,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1") {
++  source_set("f32-conv-hwc2chw_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-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16119,15 +16486,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1_standalone") {
++  source_set("f32-conv-hwc2chw_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-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
 +    ]
  
 -      sources = [
@@ -16195,21 +16562,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_x64") {
++  source_set("f32-conv-hwc2chw_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16290,21 +16650,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_x64_standalone") {
++  source_set("f32-conv-hwc2chw_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -      sources = [
@@ -16372,20 +16725,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-dwconv2d-chw_sse-no-sse2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-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) {
@@ -16470,20 +16821,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-dwconv2d-chw_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-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 = [
@@ -16551,17 +16900,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_avx512f") {
++  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16642,17 +16989,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_avx512f_standalone") {
++  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
 +    ]
  
 -      sources = [
@@ -16720,19 +17065,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_f16c-fma-no-avx2") {
++  source_set("f32-dwconv2d-chw_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c"
++      "src/src/f32-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) {
@@ -16813,19 +17160,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_f16c-fma-no-avx2_standalone") {
++  source_set("f32-dwconv2d-chw_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c"
++      "src/src/f32-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 = [
@@ -16897,18 +17246,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_sse-no-sse2") {
++  source_set("f32-dwconv_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-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-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) {
@@ -16993,18 +17344,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_sse-no-sse2_standalone") {
++  source_set("f32-dwconv_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-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-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 = [
@@ -17047,23 +17400,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vapproxgelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_x64") {
++  source_set("f32-dwconv_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-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 = [
@@ -17167,23 +17514,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_x64_standalone") {
++  source_set("f32-dwconv_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-25p16c-minmax-avx512f.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx512f.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx512f.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx512f.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17273,17 +17614,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-dwconv_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -17320,17 +17663,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-dwconv_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c"
 +    ]
  
 -      sources = [
@@ -17512,20 +17857,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-dwconv_sse-no-sse2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -17632,20 +17975,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-dwconv_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -17779,16 +18120,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma") {
++  source_set("f32-dwconv_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.c"
++      "src/src/f32-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) {
@@ -17852,16 +18200,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma_standalone") {
++  source_set("f32-dwconv_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.c"
++      "src/src/f32-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 = [
@@ -17995,15 +18350,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_sse2-no-sse3") {
++  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -18040,15 +18397,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_sse2-no-sse3_standalone") {
++  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
 +    ]
  
 -      sources = [
@@ -18172,15 +18531,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_sse4.1-no-sse4.2") {
++  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -18234,15 +18598,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.c"
 +    ]
  
 -      sources = [
@@ -18285,14 +18654,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vcmul_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_x64") {
++  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -18396,14 +18767,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_x64_standalone") {
++  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18491,20 +18864,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-f16-vcvt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-avx-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -18541,20 +18909,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-f16-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-avx-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c"
 +    ]
  
 -      sources = [
@@ -18676,17 +19039,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_avx512f") {
++  source_set("f32-f16-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x32-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x32-minmax-avx512f-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -18723,17 +19084,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_avx512f_standalone") {
++  source_set("f32-f16-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x32-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x32-minmax-avx512f-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c"
 +    ]
  
 -      sources = [
@@ -18853,24 +19212,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_f16c-fma-no-avx2") {
++  source_set("f32-f16-vcvt_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-10x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-2x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-fma3-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -18907,24 +19256,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_f16c-fma-no-avx2_standalone") {
++  source_set("f32-f16-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-10x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-2x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-fma3-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      sources = [
@@ -19042,17 +19381,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_sse-no-sse2") {
++  source_set("f32-gemm_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-gemm/gen/f32-gemm-1x8-minmax-sse-load1.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-sse-load1.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-avx-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-avx-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-avx-broadcast.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -19089,17 +19431,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_sse-no-sse2_standalone") {
++  source_set("f32-gemm_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-gemm/gen/f32-gemm-1x8-minmax-sse-load1.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-sse-load1.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-avx-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-avx-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-avx-broadcast.c"
 +    ]
  
 -      sources = [
@@ -19229,21 +19574,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_x64") {
++  source_set("f32-gemm_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x32-minmax-avx512f-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x32-minmax-avx512f-broadcast.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -19302,21 +19643,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_x64_standalone") {
++  source_set("f32-gemm_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x32-minmax-avx512f-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x32-minmax-avx512f-broadcast.c"
 +    ]
  
 -      sources = [
@@ -19384,15 +19721,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_sse-no-sse2") {
++  source_set("f32-gemm_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.c"
++      "src/src/f32-gemm/gen/f32-gemm-10x8-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-2x16-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-fma3-broadcast.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19477,15 +19823,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_sse-no-sse2_standalone") {
++  source_set("f32-gemm_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.c"
++      "src/src/f32-gemm/gen/f32-gemm-10x8-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-2x16-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-fma3-broadcast.c"
 +    ]
  
 -      sources = [
@@ -19528,14 +19883,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-velu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_x64") {
++  source_set("f32-gemm_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-sse-load1.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-sse-load1.c"
 +    ]
  
 -      sources = [
@@ -19639,14 +19997,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_x64_standalone") {
++  source_set("f32-gemm_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-sse-load1.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-sse-load1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19734,15 +20095,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_sse-no-sse2") {
++  source_set("f32-gemm_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.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" ]
@@ -19779,15 +20144,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear_sse-no-sse2_standalone") {
++  source_set("f32-gemm_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.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 = [
@@ -19903,14 +20272,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_x64") {
++  source_set("f32-ibilinear-chw_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -19947,14 +20317,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear_x64_standalone") {
++  source_set("f32-ibilinear-chw_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.c"
 +    ]
  
 -      sources = [
@@ -20084,20 +20455,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-ibilinear-chw_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-avx-broadcast.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -20156,20 +20521,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-ibilinear-chw_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-avx-broadcast.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      sources = [
@@ -20237,17 +20596,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-igemm_avx512f") {
++  source_set("f32-ibilinear_sse-no-sse2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x32-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x32-minmax-avx512f-broadcast.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20332,17 +20689,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_avx512f_standalone") {
++  source_set("f32-ibilinear_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x32-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x32-minmax-avx512f-broadcast.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.c"
 +    ]
  
 -      sources = [
@@ -20385,23 +20740,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vgelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_f16c-fma-no-avx2") {
++  source_set("f32-ibilinear_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-10x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-fma3-broadcast-prfm.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-fma3-broadcast.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -20505,23 +20851,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_f16c-fma-no-avx2_standalone") {
++  source_set("f32-ibilinear_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-10x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-fma3-broadcast-prfm.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-fma3-broadcast.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20611,17 +20948,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_sse-no-sse2") {
++  source_set("f32-igemm_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-igemm/gen/f32-igemm-1x8-minmax-sse-load1.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-sse-load1.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-avx-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-avx-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-avx-broadcast.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -20658,17 +20998,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_sse-no-sse2_standalone") {
++  source_set("f32-igemm_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-igemm/gen/f32-igemm-1x8-minmax-sse-load1.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-sse-load1.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-avx-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-avx-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-avx-broadcast.c"
 +    ]
  
 -      sources = [
@@ -20784,21 +21127,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_x64") {
++  source_set("f32-igemm_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x32-minmax-avx512f-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x32-minmax-avx512f-broadcast.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -20835,21 +21174,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_x64_standalone") {
++  source_set("f32-igemm_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x32-minmax-avx512f-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x32-minmax-avx512f-broadcast.c"
 +    ]
  
 -      sources = [
@@ -20979,15 +21314,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_sse2-no-sse3") {
++  source_set("f32-igemm_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
++      "src/src/f32-igemm/gen/f32-igemm-10x8-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-fma3-broadcast-prfm.c",
++    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-fma3-broadcast.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -21046,15 +21389,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_sse2-no-sse3_standalone") {
++  source_set("f32-igemm_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
++      "src/src/f32-igemm/gen/f32-igemm-10x8-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-fma3-broadcast-prfm.c",
++    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-fma3-broadcast.c"
 +    ]
  
 -      sources = [
@@ -21097,14 +21448,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vhswish_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_x64") {
++  source_set("f32-igemm_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-sse-load1.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-sse-load1.c"
 +    ]
  
 -      sources = [
@@ -21151,14 +21505,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_x64_standalone") {
++  source_set("f32-igemm_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-sse-load1.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-sse-load1.c"
 +    ]
  
 -      sources = [
@@ -21201,18 +21558,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlog_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-igemm_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx-broadcast.c"
++      "src/src/f32-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 = [
@@ -21316,18 +21674,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-igemm_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx-broadcast.c"
++      "src/src/f32-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) {
@@ -21433,17 +21792,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_f16c-fma-avx2") {
++  source_set("f32-maxpool_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx2-broadcast.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -21502,17 +21859,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc4w-gemm_f16c-fma-avx2_standalone") {
++  source_set("f32-maxpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx2-broadcast.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
 +    ]
  
 -      sources = [
@@ -21580,17 +21935,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_f16c-fma-no-avx2") {
++  source_set("f32-maxpool_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-fma3-broadcast.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -21675,17 +22027,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc4w-gemm_f16c-fma-no-avx2_standalone") {
++  source_set("f32-maxpool_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-fma3-broadcast.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -21728,16 +22077,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlrelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2") {
++  source_set("f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-sse41-dup.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-sse41-dup.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx-broadcast.c"
 +    ]
  
 -      sources = [
@@ -21839,16 +22190,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-qc4w-gemm_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-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-sse41-dup.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-sse41-dup.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx-broadcast.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -21936,15 +22289,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_x64") {
++  source_set("f32-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx2-broadcast.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -21981,15 +22336,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc4w-gemm_x64_standalone") {
++  source_set("f32-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx2-broadcast.c"
 +    ]
  
 -      sources = [
@@ -22101,18 +22458,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-qc4w-gemm_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx-broadcast.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-fma3-broadcast.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22149,18 +22505,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-qc4w-gemm_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-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx-broadcast.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-fma3-broadcast.c"
 +    ]
  
 -      sources = [
@@ -22297,17 +22652,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_f16c-fma-avx2") {
++  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx2-broadcast.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-sse41-dup.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-sse41-dup.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -22387,17 +22741,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_f16c-fma-avx2_standalone") {
++  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx2-broadcast.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-sse41-dup.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-sse41-dup.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -22521,23 +22874,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-qc4w-gemm_x64") {
 +    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"
++      "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) {
@@ -22586,23 +22931,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-qc4w-gemm_x64_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"
++      "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 = [
@@ -22724,17 +23061,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_f16c-fma-no-avx2") {
++  source_set("f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx-broadcast.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22771,17 +23109,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_f16c-fma-no-avx2_standalone") {
++  source_set("f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx-broadcast.c"
 +    ]
  
 -      sources = [
@@ -22897,16 +23236,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_sse4.1-no-sse4.2") {
++  source_set("f32-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx2-broadcast.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22943,16 +23283,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx2-broadcast.c"
 +    ]
  
 -      sources = [
@@ -22997,7 +23338,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-nr2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -23036,7 +23376,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-nr2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -23083,15 +23422,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_x64") {
++  source_set("f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-7x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x32-minmax-avx512skx-broadcast.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -23166,15 +23513,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_x64_standalone") {
++  source_set("f32-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-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-7x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x32-minmax-avx512skx-broadcast.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -23290,17 +23645,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-qc8w-gemm_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-fma3-broadcast.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -23383,17 +23738,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-qc8w-gemm_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-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-fma3-broadcast.c"
 +    ]
  
 -      sources = [
@@ -23461,16 +23816,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_f16c-fma-avx2") {
++  source_set("f32-qc8w-gemm_sse4.1-no-sse4.2") {
 +    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-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-sse41-dup.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-sse41-dup.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -23555,16 +23910,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_f16c-fma-avx2_standalone") {
++  source_set("f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.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 = [
@@ -23607,20 +23962,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsin_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-qc8w-gemm_x64") {
 +    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"
++      "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 = [
@@ -23724,20 +24074,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-qc8w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
++      "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) {
@@ -23827,15 +24172,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_sse2-no-sse3") {
++  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -23872,15 +24219,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_sse2-no-sse3_standalone") {
++  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
 +    ]
  
 -      sources = [
@@ -23998,15 +24347,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_sse4.1-no-sse4.2") {
++  source_set("f32-qs8-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -24043,15 +24393,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-qs8-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.c"
 +    ]
  
 -      sources = [
@@ -24165,15 +24516,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_x64") {
++  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-scalar-imagic-u4.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -24210,15 +24566,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_x64_standalone") {
++  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
 +    ]
  
 -      sources = [
@@ -24334,17 +24695,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  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-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -24381,17 +24740,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-qs8-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
 +    ]
  
 -      sources = [
@@ -24521,16 +24878,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_f16c-fma-avx2") {
++  source_set("f32-qs8-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -24589,16 +24945,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_f16c-fma-avx2_standalone") {
++  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-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
 +    ]
  
 -      sources = [
@@ -24640,208 +24995,260 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vtanh_x64_standalone") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vunary/gen/f32-vabs-avx.c",
--        "src/src/f32-vunary/gen/f32-vneg-avx.c",
--        "src/src/f32-vunary/gen/f32-vsqr-avx.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vunary/gen/f32-vabs-avx.c",
--        "src/src/f32-vunary/gen/f32-vneg-avx.c",
--        "src/src/f32-vunary/gen/f32-vsqr-avx.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f32-vunary_avx512f") {
--      cflags = [ "-mavx512f" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-qs8-vcvt_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vunary/gen/f32-vabs-avx512f.c",
--        "src/src/f32-vunary/gen/f32-vneg-avx512f.c",
--        "src/src/f32-vunary/gen/f32-vsqr-avx512f.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vunary_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
-+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"
++      "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-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-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-vunary_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vunary/gen/f32-vabs-avx.c",
+-        "src/src/f32-vunary/gen/f32-vneg-avx.c",
+-        "src/src/f32-vunary/gen/f32-vsqr-avx.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++# 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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vunary/gen/f32-vabs-avx.c",
+-        "src/src/f32-vunary/gen/f32-vneg-avx.c",
+-        "src/src/f32-vunary/gen/f32-vsqr-avx.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++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-vunary_avx512f") {
+-      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") {
++    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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vunary/gen/f32-vabs-avx512f.c",
+-        "src/src/f32-vunary/gen/f32-vneg-avx512f.c",
+-        "src/src/f32-vunary/gen/f32-vsqr-avx512f.c",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vunary_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
++if (build_with_chromium) {
++  source_set("f32-qu8-vcvt_f16c-fma-avx2") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vunary/gen/f32-vabs-avx512f.c",
+-        "src/src/f32-vunary/gen/f32-vneg-avx512f.c",
+-        "src/src/f32-vunary/gen/f32-vsqr-avx512f.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -24905,15 +25312,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_sse2-no-sse3_standalone") {
++  source_set("f32-qu8-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -24971,15 +25379,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_x64") {
++  source_set("f32-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25003,15 +25416,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_x64_standalone") {
++  source_set("f32-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
 +    ]
  
 -      sources = [
@@ -25056,14 +25474,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vunary_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_avx512f") {
++  source_set("f32-qu8-vcvt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
 +    ]
  
 -      sources = [
@@ -25112,26 +25531,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
++  source_set("f32-qu8-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
 +    ]
  
 -      sources = [
@@ -25172,31 +25580,26 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("operators_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -25242,12 +25645,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2") {
@@ -25274,18 +25676,25 @@ Index: chromium-148.0.7778.96/third_party/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-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"
 +    ]
  
 -      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) {
@@ -25320,20 +25729,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
++    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-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
@@ -25362,20 +25767,26 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-qu8-vcvt_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
++    ]
  
 -      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) {
@@ -25411,13 +25822,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2") {
@@ -25444,30 +25856,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -25502,6 +25898,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++if (build_with_chromium) {
++  source_set("f32-raddstoreexpminusmax_avx512f") {
++    cflags = [
++      "-mavx512f"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-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",
@@ -25518,20 +25930,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.c"
 +    ]
  
 -      sources = [
@@ -25574,15 +25980,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc2w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_sse2-no-sse3") {
++  source_set("f32-raddstoreexpminusmax_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
 +    ]
  
 -      sources = [
@@ -25692,15 +26099,16 @@ Index: chromium-148.0.7778.96/third_party/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-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -25814,14 +26222,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_x64") {
++  source_set("f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -25914,14 +26328,20 @@ Index: chromium-148.0.7778.96/third_party/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-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -26052,18 +26472,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-raddstoreexpminusmax_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-u32.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -26175,18 +26592,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -26324,15 +26738,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_avx512f") {
++  source_set("f32-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -26459,15 +26872,14 @@ Index: chromium-148.0.7778.96/third_party/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-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -26590,16 +27002,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_sse2-no-sse3") {
++  source_set("f32-rdminmax_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -26722,16 +27136,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_sse2-no-sse3_standalone") {
++  source_set("f32-rdminmax_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.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" ]
@@ -26876,15 +27292,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_x64") {
++  source_set("f32-rdminmax_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-rdminmax/gen/f32-rdmax-2p2x-avx512f-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -26993,15 +27409,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_x64_standalone") {
++  source_set("f32-rdminmax_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-rdminmax/gen/f32-rdmax-2p2x-avx512f-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -27134,17 +27550,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-rdminmax_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.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) {
@@ -27264,39 +27679,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-rdminmax_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-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -27330,32 +27731,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-rdsum2_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-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("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2") {
@@ -27381,30 +27763,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-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" ]
@@ -27447,15 +27805,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_sse2-no-sse3") {
++  source_set("f32-rdminmax_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.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" ]
@@ -27479,15 +27837,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_sse2-no-sse3_standalone") {
++  source_set("f32-rdminmax_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -27531,14 +27889,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qb4w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_x64") {
++  source_set("f32-rdsum2_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.c"
 +    ]
  
 -      sources = [
@@ -27565,21 +27926,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
@@ -27608,36 +27959,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-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",
++      "//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" ]
    }
 +}
  
@@ -27676,8 +28007,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-rdsum_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-rdsum2_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -27687,24 +28020,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-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",
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2") {
@@ -27731,21 +28048,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -27801,14 +28103,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_avx512f") {
++  source_set("f32-rdsum2_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx512f.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -27832,14 +28134,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_avx512f_standalone") {
++  source_set("f32-rdsum2_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx512f.c"
 +    ]
  
 -      sources = [
@@ -27882,7 +28184,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc2w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_sse2-no-sse3") {
++  source_set("f32-rdsum2_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -27890,7 +28192,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.c"
 +    ]
  
 -      sources = [
@@ -27916,21 +28218,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
@@ -27959,37 +28251,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//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" ]
    }
 +}
  
@@ -28028,32 +28299,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-rdsum_x64") {
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-rdsum2_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-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-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2") {
@@ -28080,38 +28338,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -28145,36 +28385,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-rminmax_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
+     }
    }
 +}
  
@@ -28210,43 +28425,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_avx-no-avx2-no-f16c-no-fma_standalone") {
++if (build_with_chromium) {
++  source_set("f32-rdsum2_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-avx-u32-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-avx-u32-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-avx-u32-acc4.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-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" ]
-+
-+    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) {
@@ -28288,24 +28484,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-rminmax_avx512f") {
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -28350,38 +28528,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_avx512f_standalone") {
++  source_set("f32-rdsum2_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-avx512f-u64-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    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) {
@@ -28422,35 +28585,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-rminmax_sse-no-sse2") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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(
@@ -28484,33 +28625,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_sse-no-sse2_standalone") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    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" ]
@@ -28560,34 +28674,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_x64") {
++  source_set("f32-rdsum_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-avx-u32.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -28623,40 +28723,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_x64_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"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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) {
@@ -28700,32 +28780,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-rsum2_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-avx-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" ]
    }
 +}
@@ -28756,7 +28810,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-rdsum_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -28766,29 +28820,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-avx-u8.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -28822,32 +28863,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-rsum2_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
@@ -28873,30 +28895,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -28939,15 +28937,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_sse2-no-sse3") {
++  source_set("f32-rdsum_avx512f") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-sse2-u4.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -28971,15 +28968,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_sse2-no-sse3_standalone") {
++  source_set("f32-rdsum_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-sse2-u4.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.c"
 +    ]
  
 -      sources = [
@@ -29023,14 +29019,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc4w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_x64") {
++  source_set("f32-rdsum_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
 +    ]
  
 -      sources = [
@@ -29057,21 +29054,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
@@ -29100,36 +29087,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_x64_standalone") {
-+    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" ]
-+
 +    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" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -29168,35 +29135,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-rsum_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-rdsum_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx-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",
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2") {
@@ -29223,41 +29174,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx-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" ]
-+
+ 
+-      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) {
@@ -29291,31 +29221,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-rsum_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    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" ]
+     }
    }
 +}
  
@@ -29351,38 +29261,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_avx512f_standalone") {
++if (build_with_chromium) {
++  source_set("f32-rdsum_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -29424,23 +29320,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-rsum_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "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" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -29485,37 +29364,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_sse2-no-sse3_standalone") {
++  source_set("f32-rdsum_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-sse2-u16-acc4.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -29556,32 +29421,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-rsum_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    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(
@@ -29617,30 +29463,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    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" ]
@@ -29692,33 +29514,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-spmm_sse-no-sse2") {
++  source_set("f32-rminmax_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-spmm/gen/f32-spmm-32x1-minmax-sse.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "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"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc8w-gemm_sse2-no-sse3") {
@@ -29744,39 +29555,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_sse-no-sse2_standalone") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-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" ]
-+
+ 
+-      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) {
@@ -29810,31 +29602,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-spmm_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -29865,23 +29632,27 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_x64_standalone") {
++  source_set("f32-rminmax_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-rminmax/gen/f32-rmax-avx-u32-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-avx-u32-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-avx-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -29890,8 +29661,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -29931,17 +29701,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-rminmax_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-rminmax/gen/f32-rmax-avx512f-u64-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -29965,17 +29734,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-rminmax_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-rminmax/gen/f32-rmax-avx512f-u64-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c"
 +    ]
  
 -      sources = [
@@ -30020,14 +29788,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_avx512f") {
++  source_set("f32-rminmax_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-rminmax/gen/f32-rmax-sse-u16-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-sse-u16-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-sse-u16-acc4.c"
 +    ]
  
 -      sources = [
@@ -30055,21 +29826,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
@@ -30098,36 +29859,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-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",
 +      "//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" ]
    }
 +}
  
@@ -30166,34 +29907,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_f16c-fma-no-avx2") {
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-rminmax_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-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",
++      "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" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2") {
@@ -30220,40 +29948,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_f16c-fma-no-avx2_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-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" ]
-+
+ 
+-      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) {
@@ -30287,33 +29995,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_sse2-no-sse3") {
-+    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",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -30349,40 +30035,26 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_sse2-no-sse3_standalone") {
++if (build_with_chromium) {
++  source_set("f32-rminmax_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-sse2-rational-12-10-div.c",
-+    "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-sse2fma-rational-12-10-div.c"
++      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    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) {
@@ -30424,22 +30096,6 @@ Index: chromium-148.0.7778.96/third_party/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",
@@ -30484,36 +30140,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_x64_standalone") {
++  source_set("f32-rminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    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) {
@@ -30554,53 +30199,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  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-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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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(
@@ -30636,51 +30241,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-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-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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    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" ]
@@ -30732,50 +30292,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_avx512f") {
++  source_set("f32-rsum2_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-avx512f-u32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-rsum2/gen/f32-rsum2-avx-u8.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qd8-f32-qc8w-igemm_sse2-no-sse3") {
@@ -30801,56 +30331,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-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" ]
-     }
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -30884,45 +30378,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vbinary_sse-no-sse2") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-sse-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -30953,37 +30408,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_sse-no-sse2_standalone") {
++  source_set("f32-rsum2_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-vbinary/gen/f32-vadd-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-sse-u8.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-avx-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",
@@ -30992,8 +30435,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -31033,17 +30475,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_sse2-no-sse3") {
++  source_set("f32-rsum2_avx512f") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-rsum2/gen/f32-rsum2-avx512f-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31067,17 +30506,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_sse2-no-sse3_standalone") {
++  source_set("f32-rsum2_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-rsum2/gen/f32-rsum2-avx512f-u16.c"
 +    ]
  
 -      sources = [
@@ -31122,32 +30558,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-igemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_x64") {
++  source_set("f32-rsum2_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-sse2-u4.c"
 +    ]
  
 -      sources = [
@@ -31175,21 +30594,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma") {
@@ -31217,54 +30626,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_x64_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/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" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -31302,35 +30673,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vclamp_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-rsum2_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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",
++      "src/src/f32-rsum2/gen/f32-rsum2-sse2-u4.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-dwconv_f16c-fma-avx2") {
@@ -31357,41 +30712,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-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" ]
+-    }
+-  }
 +    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) {
@@ -31425,31 +30759,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vclamp_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -31483,38 +30797,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_avx512f_standalone") {
++if (build_with_chromium) {
++  source_set("f32-rsum2_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-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" ]
-+
-+    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) {
@@ -31554,23 +30854,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vclamp_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -31608,37 +30891,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_sse2-no-sse3_standalone") {
++  source_set("f32-rsum2_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-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" ]
-+
-+    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) {
@@ -31672,32 +30941,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        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",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-dwconv_sse4.1-no-sse4.2") {
@@ -31723,30 +30973,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -31788,59 +31014,28 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_avx512f") {
++  source_set("f32-rsum_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-avx512f-u32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-dwconv_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-avx512f-u32.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -31861,12 +31056,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -31874,17 +31073,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-dwconv_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vcmul_f16c-fma-no-avx2") {
++# 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") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c"
++      "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.c"
 +    ]
  
 -      sources = [
@@ -31913,21 +31114,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-f16-vcvt_f16c-fma-avx2") {
@@ -31953,40 +31144,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-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" ]
-+    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) {
@@ -32019,32 +31187,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vcmul_sse-no-sse2") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -32073,39 +31218,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_sse-no-sse2_standalone") {
++if (build_with_chromium) {
++  source_set("f32-rsum_avx512f") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c"
++      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-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" ]
-+
-+    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) {
@@ -32140,22 +31270,6 @@ Index: chromium-148.0.7778.96/third_party/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",
@@ -32193,36 +31307,23 @@ Index: chromium-148.0.7778.96/third_party/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-rsum_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-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" ]
-+
-+    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) {
@@ -32256,37 +31357,13 @@ Index: chromium-148.0.7778.96/third_party/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(
@@ -32317,38 +31394,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-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"
-+    ]
++    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" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -32392,34 +31440,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_avx512f") {
++  source_set("f32-rsum_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-rsum/gen/f32-rsum-sse2-u16-acc4.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-f32-vcvt_sse2-no-sse3") {
@@ -32444,40 +31476,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-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) {
@@ -32510,32 +31522,6 @@ Index: chromium-148.0.7778.96/third_party/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" ]
    }
 +}
@@ -32565,7 +31551,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_sse2-no-sse3_standalone") {
++  source_set("f32-rsum_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -32573,9 +31559,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c"
++      "src/src/f32-rsum/gen/f32-rsum-sse2-u16-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32631,16 +31615,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_x64") {
++  source_set("f32-rsum_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-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32664,16 +31646,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_x64_standalone") {
++  source_set("f32-rsum_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-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -32716,17 +31696,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-f32-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-spmm_sse-no-sse2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.c"
++      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c"
 +    ]
  
 -      sources = [
@@ -32752,21 +31730,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
@@ -32795,39 +31763,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-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" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -32866,32 +31811,19 @@ Index: chromium-148.0.7778.96/third_party/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-spmm_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-spmm/gen/f32-spmm-32x1-minmax-sse.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-packw_f16c-fma-avx2") {
@@ -32917,38 +31849,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      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) {
@@ -32981,33 +31895,11 @@ Index: chromium-148.0.7778.96/third_party/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" ]
+     }
    }
 +}
  
@@ -33043,40 +31935,26 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_f16c-fma-no-avx2_standalone") {
++if (build_with_chromium) {
++  source_set("f32-spmm_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.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" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    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) {
@@ -33118,24 +31996,6 @@ Index: chromium-148.0.7778.96/third_party/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",
@@ -33152,16 +32012,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_sse2-no-sse3_standalone") {
++  source_set("f32-spmm_x64_standalone") {
 +    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"
++      "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 = [
@@ -33187,37 +32047,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-packw_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vcos_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -33244,20 +32089,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -33288,38 +32122,27 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_x64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-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) {
@@ -33356,25 +32179,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+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-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",
@@ -33413,7 +32217,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -33423,29 +32227,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-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) {
@@ -33480,32 +32271,13 @@ Index: chromium-148.0.7778.96/third_party/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",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -33537,30 +32309,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -33608,63 +32356,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-velu_f16c-fma-avx2") {
++  source_set("f32-vapproxgelu_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    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",
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc2w-gemm_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("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",
-+    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -33685,12 +32395,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -33698,16 +32412,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-qc2w-gemm_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-velu_sse2-no-sse3") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vapproxgelu_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -33736,21 +32450,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
@@ -33778,39 +32482,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-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" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -33845,31 +32527,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        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" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -33900,38 +32560,26 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_x64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-vapproxgelu_f16c-fma-no-avx2") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-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) {
@@ -33968,25 +32616,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  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-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",
@@ -34025,39 +32654,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vapproxgelu_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-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-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" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -34092,32 +32707,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vexp_avx512f") {
-+    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" ]
-+    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(
@@ -34151,30 +32747,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-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" ]
-+    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" ]
@@ -34225,16 +32797,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vexp_f16c-fma-no-avx2") {
++  source_set("f32-vapproxgelu_sse2-no-sse3") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.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" ]
@@ -34286,23 +32858,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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-vapproxgelu_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -34311,8 +32884,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -34359,16 +32931,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vexp_sse2-no-sse3") {
++  source_set("f32-vapproxgelu_x64") {
 +    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"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34413,16 +32983,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_sse2-no-sse3_standalone") {
++  source_set("f32-vapproxgelu_x64_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"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34479,14 +33047,35 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vexp_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-vexp/gen/f32-vexp-scalar-rational-3-2-div.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34510,14 +33099,35 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_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-vexp/gen/f32-vexp-scalar-rational-3-2-div.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 = [
@@ -34561,17 +33171,32 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc4w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_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-vgelu/gen/f32-vgelu-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"
 +    ]
  
 -      sources = [
@@ -34643,25 +33268,40 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vbinary_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
++      "src/src/f32-vbinary/gen/f32-vadd-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmax-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmin-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vminc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmul-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vsub-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-avx512f-u32.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -34713,14 +33353,30 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_avx512f") {
++  source_set("f32-vbinary_sse-no-sse2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34767,14 +33423,30 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_avx512f_standalone") {
++  source_set("f32-vbinary_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34833,16 +33505,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_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-vgelu/gen/f32-vgelu-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34894,23 +33567,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vbinary_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
++      "src/src/f32-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" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -34919,8 +33594,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -34967,16 +33641,32 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_sse2-no-sse3") {
++  source_set("f32-vbinary_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c",
-+    "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c"
++      "src/src/f32-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" ]
@@ -35022,16 +33712,32 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_sse2-no-sse3_standalone") {
++  source_set("f32-vbinary_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c",
-+    "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c"
++      "src/src/f32-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" ]
@@ -35089,14 +33795,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_x64") {
++  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-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35142,22 +33851,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_x64_standalone") {
++  source_set("f32-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-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-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" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -35207,17 +33919,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vclamp_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35241,30 +33950,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vclamp_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -35287,6 +33986,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -35301,14 +34007,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-dwconv_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_avx512f") {
++  source_set("f32-vclamp_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
 +    ]
  
 -      sources = [
@@ -35383,14 +34090,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_avx512f_standalone") {
++  source_set("f32-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35404,10 +34112,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -35449,16 +34157,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_f16c-fma-no-avx2") {
++  source_set("f32-vclamp_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35506,16 +34212,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vclamp_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35529,10 +34233,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -35575,16 +34279,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_sse2-no-sse3") {
++  source_set("f32-vcmul_avx512f") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-vcmul/gen/f32-vcmul-avx512f-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35632,16 +34334,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_sse2-no-sse3_standalone") {
++  source_set("f32-vcmul_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-vcmul/gen/f32-vcmul-avx512f-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35655,10 +34355,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -35701,14 +34401,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_x64") {
++  source_set("f32-vcmul_f16c-fma-no-avx2") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35754,14 +34456,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_x64_standalone") {
++  source_set("f32-vcmul_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35775,10 +34479,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -35819,14 +34523,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlog_avx512f") {
++  source_set("f32-vcmul_sse-no-sse2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35879,14 +34584,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_avx512f_standalone") {
++  source_set("f32-vcmul_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35900,10 +34606,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -35951,16 +34657,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlog_f16c-fma-avx2") {
++  source_set("f32-vcmul_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36012,16 +34716,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_f16c-fma-avx2_standalone") {
++  source_set("f32-vcmul_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36035,10 +34737,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -36085,16 +34787,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlog_f16c-fma-no-avx2") {
++  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36149,16 +34854,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36172,10 +34880,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -36225,16 +34933,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlog_sse2-no-sse3") {
++  source_set("f32-vcopysign_avx512f") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-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" ]
@@ -36279,16 +34987,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_sse2-no-sse3_standalone") {
++  source_set("f32-vcopysign_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-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" ]
@@ -36302,10 +35010,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -36345,14 +35053,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlog_x64") {
++  source_set("f32-vcopysign_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36397,14 +35108,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_x64_standalone") {
++  source_set("f32-vcopysign_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36418,10 +35132,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -36461,17 +35175,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vcopysign_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.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" ]
@@ -36495,17 +35208,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vcopysign_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.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 = [
@@ -36549,14 +35261,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_avx512f") {
++  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-u16.c"
++      "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -36627,14 +35342,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_avx512f_standalone") {
++  source_set("f32-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-vlrelu/gen/f32-vlrelu-avx512f-u16.c"
++      "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36648,10 +35366,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -36693,15 +35411,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_sse-no-sse2") {
++  source_set("f32-vcos_avx512f") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse-u8.c"
++      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36749,15 +35466,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_sse-no-sse2_standalone") {
++  source_set("f32-vcos_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-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36771,10 +35487,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -36817,15 +35533,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_sse4.1-no-sse4.2") {
++  source_set("f32-vcos_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
++      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36873,15 +35590,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-vcos_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
++      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36895,10 +35613,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -36941,14 +35659,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_x64") {
++  source_set("f32-vcos_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36994,14 +35714,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_x64_standalone") {
++  source_set("f32-vcos_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37015,10 +35737,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -37059,15 +35781,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_sse-no-sse2") {
++  source_set("f32-vcos_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37120,15 +35841,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_sse-no-sse2_standalone") {
++  source_set("f32-vcos_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37142,10 +35862,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -37193,14 +35913,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_x64") {
++  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-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37252,14 +35975,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_x64_standalone") {
++  source_set("f32-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-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37273,10 +35999,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -37323,20 +36049,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-velu_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    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-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37391,20 +36111,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-velu_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    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-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37418,10 +36132,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -37471,17 +36185,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_avx512f") {
++  source_set("f32-velu_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37526,17 +36239,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_avx512f_standalone") {
++  source_set("f32-velu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37550,10 +36262,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -37593,7 +36305,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_sse2-no-sse3") {
++  source_set("f32-velu_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -37601,10 +36313,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-sse2-u8.c"
++      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37649,7 +36358,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_sse2-no-sse3_standalone") {
++  source_set("f32-velu_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -37657,10 +36366,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-sse2-u8.c"
++      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37674,10 +36380,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -37717,18 +36423,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_sse4.1-no-sse4.2") {
++  source_set("f32-velu_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-sse41-u8.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37752,18 +36454,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-velu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-sse41-u8.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      sources = [
@@ -37807,17 +36505,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-igemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_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-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-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -37888,17 +36586,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_x64_standalone") {
++  source_set("f32-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-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-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37912,10 +36610,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -37957,18 +36655,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vexp_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c"
++      "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38019,18 +36713,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vexp_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"
++      "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38044,10 +36734,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -38093,15 +36783,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_avx512f") {
++  source_set("f32-vexp_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-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38125,15 +36816,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_avx512f_standalone") {
++  source_set("f32-vexp_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-rsqrt.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c"
++      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -38176,7 +36868,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qu8-packw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_sse2-no-sse3") {
++  source_set("f32-vexp_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -38184,8 +36876,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-vexp/gen/f32-vexp-sse2-rational-3-2-div.c",
++    "src/src/f32-vexp/gen/f32-vexp-sse2fma-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -38253,7 +36945,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_sse2-no-sse3_standalone") {
++  source_set("f32-vexp_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -38261,8 +36953,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -38276,10 +36968,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -38319,15 +37011,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_x64") {
++  source_set("f32-vexp_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38377,15 +37068,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_x64_standalone") {
++  source_set("f32-vexp_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38399,10 +37089,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -38447,7 +37137,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -38457,8 +37147,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c",
-+    "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-nr2-u16.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38502,7 +37191,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -38512,8 +37201,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c",
-+    "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-nr2-u16.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38527,10 +37215,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -38569,14 +37257,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_avx512f") {
++  source_set("f32-vgelu_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38600,14 +37288,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_avx512f_standalone") {
++  source_set("f32-vgelu_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -38650,16 +37338,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-rdsum_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_f16c-fma-avx2") {
++  source_set("f32-vgelu_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -38729,16 +37417,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_f16c-fma-avx2_standalone") {
++  source_set("f32-vgelu_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38752,10 +37440,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -38797,7 +37485,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_sse2-no-sse3") {
++  source_set("f32-vgelu_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -38805,7 +37493,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c"
++      "src/src/f32-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" ]
@@ -38850,7 +37539,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_sse2-no-sse3_standalone") {
++  source_set("f32-vgelu_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -38858,7 +37547,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c"
++      "src/src/f32-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" ]
@@ -38872,10 +37562,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -38915,16 +37605,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_sse4.1-no-sse4.2") {
++  source_set("f32-vgelu_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c",
-+    "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-p5-div-u8.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38975,16 +37663,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-vgelu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c",
-+    "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-p5-div-u8.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38998,10 +37684,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -39047,14 +37733,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_x64") {
++  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-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39105,14 +37794,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_x64_standalone") {
++  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39126,10 +37818,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -39175,17 +37867,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vhswish_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39229,17 +37918,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vhswish_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39253,10 +37939,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -39295,14 +37981,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsin_avx512f") {
++  source_set("f32-vhswish_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-fma3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39326,14 +38014,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_avx512f_standalone") {
++  source_set("f32-vhswish_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-fma3.c"
 +    ]
  
 -      sources = [
@@ -39376,16 +38066,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-rsum_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsin_f16c-fma-no-avx2") {
++  source_set("f32-vhswish_sse2-no-sse3") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-sse2.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
 +    ]
  
 -      sources = [
@@ -39454,16 +38144,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vhswish_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-sse2.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39477,10 +38167,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -39521,16 +38211,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsin_sse2-no-sse3") {
++  source_set("f32-vhswish_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-sse2-rational-5-4-div.c",
-+    "src/src/f32-vsin/gen/f32-vsin-sse2fma-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39575,16 +38263,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_sse2-no-sse3_standalone") {
++  source_set("f32-vhswish_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-sse2-rational-5-4-div.c",
-+    "src/src/f32-vsin/gen/f32-vsin-sse2fma-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39598,10 +38284,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -39641,14 +38327,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsin_x64") {
++  source_set("f32-vlog_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39698,14 +38384,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_x64_standalone") {
++  source_set("f32-vlog_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39719,10 +38405,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -39767,18 +38453,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vlog_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c",
-+    "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39822,18 +38506,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vlog_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c",
-+    "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39847,10 +38529,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -39889,14 +38571,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_avx512f") {
++  source_set("f32-vlog_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39940,14 +38624,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_avx512f_standalone") {
++  source_set("f32-vlog_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39961,17 +38647,49 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vadd_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_sse2-no-sse3") {
++  source_set("f32-vlog_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -39979,8 +38697,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
-+    "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c"
++      "src/src/f32-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" ]
@@ -39996,12 +38714,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vadd_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_sse2-no-sse3_standalone") {
++  source_set("f32-vlog_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -40009,41 +38730,85 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
-+    "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c"
++      "src/src/f32-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-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vadd_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_x64") {
++  source_set("f32-vlog_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -40057,19 +38822,44 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_x64_standalone") {
++  source_set("f32-vlog_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40083,17 +38873,51 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -40103,7 +38927,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40119,12 +38943,36 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vaddc_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -40134,7 +38982,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40148,24 +38996,57 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      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") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_avx512f") {
++  source_set("f32-vlrelu_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40181,19 +39062,48 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_avx512f_standalone") {
++  source_set("f32-vlrelu_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40207,26 +39117,63 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_f16c-fma-no-avx2") {
++  source_set("f32-vlrelu_sse-no-sse2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-sse-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40242,21 +39189,43 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vaddc_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-sse-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40270,26 +39239,57 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vaddc_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_sse2-no-sse3") {
++  source_set("f32-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-sse41-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40305,21 +39305,43 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vaddc_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_sse2-no-sse3_standalone") {
++  source_set("f32-vlrelu_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-sse41-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40333,24 +39355,56 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
-+if (build_with_chromium) {
-+  source_set("f32-vtanh_x64") {
-+    cflags = [
-+  
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vaddc_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++if (build_with_chromium) {
++  source_set("f32-vlrelu_x64") {
++    cflags = [
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40366,57 +39420,100 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vaddc_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_x64_standalone") {
++  source_set("f32-vlrelu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vaddc_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vmulcaddc_sse-no-sse2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-c4-minmax-sse-2x.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -40430,24 +39527,45 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-c4-minmax-sse-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40461,26 +39579,58 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vunary_avx512f") {
++  source_set("f32-vmulcaddc_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-avx512f.c",
-+    "src/src/f32-vunary/gen/f32-vneg-avx512f.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-avx512f.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40496,21 +39646,43 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vcvt_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_avx512f_standalone") {
++  source_set("f32-vmulcaddc_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-avx512f.c",
-+    "src/src/f32-vunary/gen/f32-vneg-avx512f.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-avx512f.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40524,27 +39696,63 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      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") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vunary_sse2-no-sse3") {
++  source_set("f32-vrnd_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-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-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" ]
@@ -40560,22 +39768,48 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vcvt_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_sse2-no-sse3_standalone") {
++  source_set("f32-vrnd_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-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-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" ]
@@ -40589,26 +39823,59 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vcvt_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vunary_x64") {
++  source_set("f32-vrnd_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-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" ]
@@ -40624,21 +39891,45 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vcvt_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-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" ]
@@ -40652,46 +39943,60 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vcvt_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("operators_x64") {
++  source_set("f32-vrnd_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -40707,41 +40012,46 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("operators_x64_standalone") {
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vcvt_ssse3-no-sse4.1") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vrnd_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -40755,27 +40065,60 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vcvt_ssse3-no-sse4.1_standalone") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vrnd_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -40791,60 +40134,104 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vcvt_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone") {
++  source_set("f32-vrnd_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vcvt_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vrnd_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avxvnni.c",
-+    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-5x8c8-minmax-avxvnni.c"
++      "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/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -40858,24 +40245,47 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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-vrnd_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avxvnni.c",
-+    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-5x8c8-minmax-avxvnni.c"
++      "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" ]
@@ -40889,27 +40299,62 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2") {
++  source_set("f32-vrsqrt_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-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-avx-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40925,22 +40370,47 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vlrelu_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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_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-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-avx-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40954,24 +40424,58 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      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") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_x64") {
++  source_set("f32-vrsqrt_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40987,19 +40491,43 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vlrelu_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_x64_standalone") {
++  source_set("f32-vrsqrt_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41013,29 +40541,58 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vlrelu_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vrsqrt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41051,24 +40608,44 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("f32-vrsqrt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
-+    ]
++      "-mno-sse3",
++    "-msse2"
++    ]
 +  
 +    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-sse2-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41082,27 +40659,57 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vlrelu_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vrsqrt_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x8c8-minmax-avx2-madd-prfm.c"
++      "src/src/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" ]
@@ -41118,22 +40725,43 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vlrelu_ssse3-no-sse4.1") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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-vrsqrt_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x8c8-minmax-avx2-madd-prfm.c"
++      "src/src/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" ]
@@ -41147,31 +40775,59 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vlrelu_ssse3-no-sse4.1_standalone") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-vsigmoid_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-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-avx-rr2-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41187,67 +40843,100 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vlrelu_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-vsigmoid_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-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-avx-rr2-p5-div-u16.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vlrelu_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("f32-vsigmoid_avx512f") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -41261,27 +40950,44 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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_avx512f_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41295,29 +41001,60 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vsigmoid_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avxvnni-prfm.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41333,24 +41070,44 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmul_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avxvnni-prfm.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41364,27 +41121,57 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      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") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2") {
++  source_set("f32-vsigmoid_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-rr2-lut64-p2-div-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41400,22 +41187,43 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmul_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-rr2-lut64-p2-div-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41429,31 +41237,58 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vmul_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-vsigmoid_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/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-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" ]
@@ -41469,101 +41304,185 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmul_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-vsigmoid_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/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-sse41-rr2-lut64-p2-div-u8.c",
++    "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-p5-div-u8.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vmul_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("f32-vsigmoid_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256vnni.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-8x8c8-minmax-avx256vnni.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("f32-vsigmoid_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256vnni.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-8x8c8-minmax-avx256vnni.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41582,30 +41501,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41626,25 +41537,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
++  source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41668,19 +41571,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vsin_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41701,19 +41599,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("f32-vsin_avx512f_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41737,17 +41630,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2") {
++  source_set("f32-vsin_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-fma3-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41768,17 +41660,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone") {
++  source_set("f32-vsin_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-fma3-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41802,21 +41693,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-vsin_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -41837,21 +41723,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-vsin_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -41875,22 +41756,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("f32-vsin_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256vnni.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-8x8c8-minmax-avx256vnni.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41911,22 +41784,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("f32-vsin_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256vnni.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-8x8c8-minmax-avx256vnni.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41950,25 +41815,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41989,25 +41847,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
++  source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42031,18 +41882,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vsqrt_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-avx512f-rsqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42063,18 +41910,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vsqrt_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rsqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42098,17 +41941,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vsqrt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42129,17 +41971,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2_standalone") {
++  source_set("f32-vsqrt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42163,22 +42004,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("f32-vsqrt_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-8x16c8-minmax-avx512vnni-prfm.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42199,22 +42032,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("f32-vsqrt_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-8x16c8-minmax-avx512vnni-prfm.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42238,23 +42063,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
++  source_set("f32-vtanh_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42275,23 +42094,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
++  source_set("f32-vtanh_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42315,16 +42128,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_sse2-no-sse3") {
++  source_set("f32-vtanh_avx512f") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42345,16 +42156,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_sse2-no-sse3_standalone") {
++  source_set("f32-vtanh_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42378,16 +42187,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2") {
++  source_set("f32-vtanh_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-fma3-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42408,16 +42217,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-vtanh_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-fma3-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42441,15 +42250,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_x64") {
++  source_set("f32-vtanh_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -42470,15 +42280,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_x64_standalone") {
++  source_set("f32-vtanh_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -42502,19 +42313,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vtanh_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-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-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42535,19 +42341,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("f32-vtanh_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c8-minmax-avxvnni.c",
-+    "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-5x8c8-minmax-avxvnni.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42571,17 +42372,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2") {
++  source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-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-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" ]
@@ -42602,17 +42405,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2_standalone") {
++  source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-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-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" ]
@@ -42636,14 +42441,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_x64") {
++  source_set("f32-vunary_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-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" ]
@@ -42664,14 +42471,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_x64_standalone") {
++  source_set("f32-vunary_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-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" ]
@@ -42695,19 +42504,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vunary_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -42728,19 +42535,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("f32-vunary_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -42764,17 +42569,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vunary_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x8c8-minmax-avx2-madd-prfm.c"
++      "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" ]
@@ -42795,17 +42599,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2_standalone") {
++  source_set("f32-vunary_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x8c8-minmax-avx2-madd-prfm.c"
++      "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" ]
@@ -42829,23 +42632,36 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("operators_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512skx-madd-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512skx-madd-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x8c8-minmax-avx256skx-madd-prfm.c"
++      "src/src/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" ]
@@ -42866,23 +42682,36 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("operators_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512skx-madd-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512skx-madd-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x8c8-minmax-avx256skx-madd-prfm.c"
++      "src/src/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" ]
@@ -42906,22 +42735,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f16-qb4w-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-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" ]
@@ -42942,22 +42766,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qd8-f16-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-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-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" ]
@@ -42981,14 +42800,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
++  source_set("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -42996,8 +42811,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnnigfni-prfm.c"
++      "src/src/qd8-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" ]
@@ -43018,14 +42833,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
++  source_set("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -43033,8 +42844,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnnigfni-prfm.c"
++      "src/src/qd8-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" ]
@@ -43058,25 +42869,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-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-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" ]
@@ -43097,25 +42900,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
++  source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-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-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" ]
@@ -43139,16 +42934,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3") {
++  source_set("qd8-f16-qc2w-gemm_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-sse2-ld128.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-sse2-ld128.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43169,16 +42962,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3_standalone") {
++  source_set("qd8-f16-qc2w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-sse2-ld128.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-sse2-ld128.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43202,16 +42993,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
++  source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -43232,16 +43026,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone") {
++  source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -43265,15 +43062,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_x64") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-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-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" ]
@@ -43294,15 +43093,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_x64_standalone") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-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-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" ]
@@ -43326,19 +43127,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -43359,19 +43162,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -43395,17 +43200,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -43426,17 +43236,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -43460,23 +43275,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512skx-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx256skx.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x16c8-minmax-avx512skx-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x8c8-minmax-avx256skx.c"
++      "src/src/qd8-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" ]
@@ -43497,23 +43308,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512skx-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx256skx.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x16c8-minmax-avx512skx-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x8c8-minmax-avx256skx.c"
++      "src/src/qd8-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" ]
@@ -43537,22 +43344,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-10x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512vnni-prfm.c"
++      "src/src/qd8-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" ]
@@ -43573,22 +43375,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-10x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512vnni-prfm.c"
++      "src/src/qd8-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" ]
@@ -43612,25 +43409,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
++      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
-+    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-16x64c4-minmax-avx512amx.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x64c4-minmax-avx512amx.c"
++      "src/src/qd8-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" ]
@@ -43651,25 +43444,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
++      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
-+    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-16x64c4-minmax-avx512amx.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x64c4-minmax-avx512amx.c"
++      "src/src/qd8-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" ]
@@ -43693,16 +43482,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_sse2-no-sse3") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse2-ld64.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse2-ld64.c"
++      "src/src/qd8-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" ]
@@ -43723,79 +43518,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse2-ld64.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse2-ld64.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse41-ld64.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse41-ld64.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    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-gemm_sse4.1-no-sse4.2_standalone") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-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-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" ]
@@ -43819,16 +43557,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_x64") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+  
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-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-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" ]
@@ -43849,16 +43596,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_x64_standalone") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+  
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-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-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" ]
@@ -43882,7 +43638,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -43893,8 +43649,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -43915,7 +43671,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -43926,8 +43682,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -43951,7 +43707,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -43960,8 +43716,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -43982,7 +43738,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -43991,8 +43747,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44016,7 +43772,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -44029,10 +43785,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44053,7 +43807,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -44066,10 +43820,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44093,7 +43845,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -44107,8 +43859,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44129,7 +43881,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -44143,8 +43895,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44168,7 +43920,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
 +      "-mamx-int8",
 +    "-mamx-tile",
@@ -44185,8 +43937,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44207,7 +43959,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
 +      "-mamx-int8",
 +    "-mamx-tile",
@@ -44224,8 +43976,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44249,16 +44001,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_sse2-no-sse3") {
++  source_set("qd8-f32-qb4w-gemm_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/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-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" ]
@@ -44279,16 +44033,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_sse2-no-sse3_standalone") {
++  source_set("qd8-f32-qb4w-gemm_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/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-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" ]
@@ -44312,16 +44068,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse41-ld64.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse41-ld64.c"
++      "src/src/qd8-f32-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" ]
@@ -44342,16 +44099,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse41-ld64.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse41-ld64.c"
++      "src/src/qd8-f32-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" ]
@@ -44375,16 +44133,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_x64") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -44405,16 +44169,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_x64_standalone") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -44438,84 +44208,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qs8-dwconv_f16c-fma-avx2") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -44536,17 +44245,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -44570,21 +44285,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qb4w-gemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -44605,21 +44315,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qb4w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c"
++      "src/src/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" ]
@@ -44643,16 +44348,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_sse2-no-sse3") {
++  source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -44673,16 +44378,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_sse2-no-sse3_standalone") {
++  source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c"
++      "src/src/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" ]
@@ -44706,16 +44411,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_sse4.1-no-sse4.2") {
++  source_set("qd8-f32-qb4w-gemm_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c"
++      "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" ]
@@ -44736,16 +44440,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_sse4.1-no-sse4.2_standalone") {
++  source_set("qd8-f32-qb4w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c"
++      "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" ]
@@ -44769,17 +44472,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_x64") {
++  source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -44800,17 +44505,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_x64_standalone") {
++  source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -44834,7 +44541,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f16-vcvt_f16c-fma-avx2") {
++  source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -44843,7 +44550,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.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" ]
@@ -44864,7 +44572,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f16-vcvt_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -44873,7 +44581,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.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" ]
@@ -44897,17 +44606,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qd8-f32-qc2w-gemm_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44928,17 +44634,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qd8-f32-qc2w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44962,16 +44665,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx2") {
++  source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-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-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" ]
@@ -44992,16 +44698,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-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-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" ]
@@ -45025,20 +44734,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -45059,20 +44765,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -45096,15 +44799,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_sse2-no-sse3") {
++  source_set("qd8-f32-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-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.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" ]
@@ -45125,15 +44836,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_sse2-no-sse3_standalone") {
++  source_set("qd8-f32-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-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.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" ]
@@ -45157,15 +44876,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_sse4.1-no-sse4.2") {
++  source_set("qd8-f32-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-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.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" ]
@@ -45186,15 +44912,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("qd8-f32-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-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.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" ]
@@ -45218,14 +44951,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_x64") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.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" ]
@@ -45246,14 +44988,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_x64_standalone") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.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" ]
@@ -45277,10 +45028,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f32-qc4w-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"
@@ -45288,8 +45045,8 @@ Index: chromium-148.0.7778.96/third_party/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-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" ]
@@ -45310,10 +45067,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qd8-f32-qc4w-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"
@@ -45321,8 +45084,8 @@ Index: chromium-148.0.7778.96/third_party/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-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" ]
@@ -45346,16 +45109,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_f16c-fma-avx2") {
++  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c"
++      "src/src/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" ]
@@ -45376,16 +45139,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c"
++      "src/src/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" ]
@@ -45409,23 +45172,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-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" ]
@@ -45446,23 +45202,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -45486,17 +45235,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_x64") {
++  source_set("qd8-f32-qc4w-gemm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/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" ]
@@ -45517,17 +45264,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_x64_standalone") {
++  source_set("qd8-f32-qc4w-gemm_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/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" ]
@@ -45551,7 +45296,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -45562,8 +45307,8 @@ Index: chromium-148.0.7778.96/third_party/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-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" ]
@@ -45584,7 +45329,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -45595,8 +45340,8 @@ Index: chromium-148.0.7778.96/third_party/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-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" ]
@@ -45620,7 +45365,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -45629,8 +45374,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -45651,7 +45396,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -45660,8 +45405,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -45685,7 +45430,7 @@ Index: chromium-148.0.7778.96/third_party/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -45698,8 +45443,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -45720,7 +45467,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -45733,8 +45480,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -45758,17 +45507,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_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-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-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" ]
@@ -45789,17 +45543,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_x64_standalone") {
++  source_set("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-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-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" ]
@@ -45823,18 +45582,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -45855,18 +45621,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -45890,19 +45663,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f32-qc8w-gemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -45923,19 +45693,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qd8-f32-qc8w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -45959,17 +45726,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -45990,17 +45756,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -46024,23 +45789,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc8w-gemm_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -46061,23 +45819,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qc8w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c"
++      "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" ]
@@ -46101,22 +45852,19 @@ Index: chromium-148.0.7778.96/third_party/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_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-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-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" ]
@@ -46137,22 +45885,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qd8-f32-qc8w-igemm_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-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-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" ]
@@ -46176,16 +45921,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c"
++      "src/src/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" ]
@@ -46206,16 +45952,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1_standalone") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c"
++      "src/src/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" ]
@@ -46239,15 +45986,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_x64") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -46268,15 +46023,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_x64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -46300,19 +46063,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qd8-f32-qc8w-igemm_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-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/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" ]
@@ -46333,19 +46099,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qd8-f32-qc8w-igemm_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-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/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" ]
@@ -46369,18 +46138,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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/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" ]
@@ -46401,18 +46177,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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/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" ]
@@ -46436,22 +46219,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc8w-igemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -46472,22 +46249,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qc8w-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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/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" ]
@@ -46511,17 +46282,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_sse2-no-sse3") {
++  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c"
++      "src/src/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" ]
@@ -46542,17 +46312,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") {
++  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c"
++      "src/src/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" ]
@@ -46576,17 +46345,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
++  source_set("qd8-f32-qc8w-igemm_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c"
++      "src/src/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" ]
@@ -46607,17 +46375,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") {
++  source_set("qd8-f32-qc8w-igemm_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c"
++      "src/src/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" ]
@@ -46641,19 +46408,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_x64") {
++  source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -46674,19 +46440,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_x64_standalone") {
++  source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-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-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" ]
@@ -46710,18 +46475,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-dwconv_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-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" ]
@@ -46742,18 +46506,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-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-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" ]
@@ -46777,19 +46540,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -46810,19 +46575,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-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-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" ]
@@ -46846,19 +46613,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
++  source_set("qs8-dwconv_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnniint8",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -46879,19 +46643,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
++  source_set("qs8-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnniint8",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -46915,17 +46676,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
++  source_set("qs8-dwconv_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -46946,17 +46706,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx2_standalone") {
++  source_set("qs8-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-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-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" ]
@@ -46980,23 +46739,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-dwconv_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx256skx.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c8-minmax-fp32-avx256skx.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c"
++      "src/src/qs8-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" ]
@@ -47017,23 +46770,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-dwconv_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx256skx.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c8-minmax-fp32-avx256skx.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c"
++      "src/src/qs8-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" ]
@@ -47057,22 +46804,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-f16-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512vnni-prfm.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512vnni-prfm.c"
++      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47093,22 +46834,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qs8-f16-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512vnni-prfm.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512vnni-prfm.c"
++      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47132,25 +46867,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47171,25 +46898,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
++  source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47213,16 +46932,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_sse2-no-sse3") {
++  source_set("qs8-f32-vcvt_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-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47243,16 +46962,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_sse2-no-sse3_standalone") {
++  source_set("qs8-f32-vcvt_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-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47276,16 +46995,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2") {
++  source_set("qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47306,16 +47029,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47339,15 +47066,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_x64") {
++  source_set("qs8-f32-vcvt_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47368,15 +47095,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_x64_standalone") {
++  source_set("qs8-f32-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47400,18 +47127,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-f32-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47432,18 +47156,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47467,19 +47188,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-f32-vcvt_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47500,19 +47216,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qs8-f32-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnni-prfm.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnni-prfm.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47536,10 +47247,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") {
++  source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnniint8",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -47547,8 +47258,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnniint8-prfm.c"
++      "src/src/qs8-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" ]
@@ -47569,10 +47280,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
++  source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnniint8",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -47580,8 +47291,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnniint8-prfm.c"
++      "src/src/qs8-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" ]
@@ -47605,7 +47316,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx2") {
++  source_set("qs8-packw_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -47614,8 +47325,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx2.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x8c8-minmax-fp32-avx2.c"
++      "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47636,7 +47346,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx2_standalone") {
++  source_set("qs8-packw_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -47645,8 +47355,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx2.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x8c8-minmax-fp32-avx2.c"
++      "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47670,23 +47379,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -47707,23 +47416,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -47747,22 +47456,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-packw_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-avx512vnni-prfm.c"
++      "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" ]
@@ -47783,22 +47487,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qs8-packw_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-avx512vnni-prfm.c"
++      "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" ]
@@ -47822,16 +47521,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qs8-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -47839,8 +47532,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-16x64c4-minmax-fp32-avx512amx.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x64c4-minmax-fp32-avx512amx.c"
++      "src/src/qs8-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" ]
@@ -47861,16 +47554,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
++  source_set("qs8-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -47878,8 +47565,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-16x64c4-minmax-fp32-avx512amx.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x64c4-minmax-fp32-avx512amx.c"
++      "src/src/qs8-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" ]
@@ -47903,16 +47590,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_sse2-no-sse3") {
++  source_set("qs8-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-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-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" ]
@@ -47933,16 +47621,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_sse2-no-sse3_standalone") {
++  source_set("qs8-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-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-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" ]
@@ -47966,16 +47655,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2") {
++  source_set("qs8-qc2w-gemm_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-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-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" ]
@@ -47996,16 +47690,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-qc2w-gemm_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-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-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" ]
@@ -48029,15 +47728,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_x64") {
++  source_set("qs8-qc2w-gemm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "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" ]
@@ -48058,15 +47759,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_x64_standalone") {
++  source_set("qs8-qc2w-gemm_x64_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-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" ]
@@ -48090,18 +47793,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.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" ]
@@ -48122,18 +47825,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.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" ]
@@ -48157,21 +47860,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.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" ]
@@ -48192,80 +47893,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-qu8-packw_x64_standalone") {
-+    cflags = [
-+  
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
++    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48289,7 +47929,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_f16c-fma-avx2") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -48298,7 +47938,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.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" ]
@@ -48319,7 +47960,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -48328,7 +47969,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.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" ]
@@ -48352,7 +47994,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -48365,7 +48007,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.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" ]
@@ -48386,7 +48031,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -48399,7 +48044,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.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" ]
@@ -48423,15 +48071,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_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-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.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" ]
@@ -48452,15 +48107,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-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-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.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" ]
@@ -48484,14 +48146,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_x64") {
++  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.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" ]
@@ -48512,14 +48176,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_x64_standalone") {
++  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.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" ]
@@ -48543,18 +48209,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-avxvnni-u128-acc2.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" ]
@@ -48575,18 +48238,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qs8-qc4w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.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" ]
@@ -48610,7 +48270,76 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_f16c-fma-avx2") {
++  source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qs8-qc8w-dwconv_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -48619,7 +48348,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c"
++      "src/src/qs8-qc8w-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" ]
@@ -48640,7 +48371,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc8w-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -48649,7 +48380,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c"
++      "src/src/qs8-qc8w-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" ]
@@ -48673,7 +48406,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -48686,8 +48419,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx256skx-u64-acc2.c",
-+    "src/src/qs8-rsum/gen/qs8-rsum-avx512skx-u128-acc2.c"
++      "src/src/qs8-qc8w-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" ]
@@ -48708,7 +48442,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -48721,8 +48455,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx256skx-u64-acc2.c",
-+    "src/src/qs8-rsum/gen/qs8-rsum-avx512skx-u128-acc2.c"
++      "src/src/qs8-qc8w-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" ]
@@ -48746,21 +48481,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-qc8w-dwconv_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.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" ]
@@ -48781,21 +48512,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.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" ]
@@ -48819,15 +48546,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_ssse3-no-sse4.1") {
++  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.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" ]
@@ -48848,15 +48577,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_ssse3-no-sse4.1_standalone") {
++  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.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" ]
@@ -48880,14 +48611,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_x64") {
++  source_set("qs8-qc8w-dwconv_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.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" ]
@@ -48908,14 +48644,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_x64_standalone") {
++  source_set("qs8-qc8w-dwconv_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.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" ]
@@ -48939,7 +48680,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -48949,7 +48690,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx-ld128.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48970,7 +48712,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -48980,7 +48722,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx-ld128.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49004,16 +48747,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_f16c-fma-avx2") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -49034,16 +48780,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -49067,20 +48816,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
++    "-mavxvnniint8",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -49101,20 +48849,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
++    "-mavxvnniint8",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -49138,15 +48885,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_sse2-no-sse3") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx2.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x8c8-minmax-fp32-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49167,15 +48916,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_sse2-no-sse3_standalone") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx2.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x8c8-minmax-fp32-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49199,139 +48950,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_sse4.1-no-sse4.2") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_sse4.1-no-sse4.2_standalone") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qs8-vadd_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -49352,17 +48987,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -49386,16 +49027,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_f16c-fma-avx2") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.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" ]
@@ -49416,16 +49063,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.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" ]
@@ -49449,20 +49102,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx512bw",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -49483,20 +49141,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx512bw",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -49520,7 +49183,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_sse2-no-sse3") {
++  source_set("qs8-qc8w-gemm_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -49528,7 +49191,8 @@ Index: chromium-148.0.7778.96/third_party/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-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" ]
@@ -49549,7 +49213,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_sse2-no-sse3_standalone") {
++  source_set("qs8-qc8w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -49557,7 +49221,8 @@ Index: chromium-148.0.7778.96/third_party/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-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" ]
@@ -49581,7 +49246,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_sse4.1-no-sse4.2") {
++  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -49589,7 +49254,8 @@ Index: chromium-148.0.7778.96/third_party/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-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" ]
@@ -49610,7 +49276,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -49618,7 +49284,8 @@ Index: chromium-148.0.7778.96/third_party/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-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" ]
@@ -49642,15 +49309,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_x64") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -49671,15 +49338,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_x64_standalone") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -49703,7 +49370,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -49713,7 +49380,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.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" ]
@@ -49734,7 +49402,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -49744,7 +49412,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.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" ]
@@ -49768,16 +49437,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_f16c-fma-avx2") {
++  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.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" ]
@@ -49798,16 +49470,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.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" ]
@@ -49831,76 +49506,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qs8-vcvt_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-vcvt/gen/qs8-vcvt-sse41-u32.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" ]
@@ -49921,15 +49539,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-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-vcvt/gen/qs8-vcvt-sse41-u32.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" ]
@@ -49953,15 +49575,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_ssse3-no-sse4.1") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
++      "src/src/qs8-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" ]
@@ -49982,15 +49606,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_ssse3-no-sse4.1_standalone") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
++      "src/src/qs8-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" ]
@@ -50014,14 +49640,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_x64") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.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" ]
@@ -50042,14 +49677,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_x64_standalone") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.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" ]
@@ -50073,17 +49717,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc8w-igemm_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-vlrelu/gen/qs8-vlrelu-avx-u32.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" ]
@@ -50104,17 +49753,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-qc8w-igemm_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-vlrelu/gen/qs8-vlrelu-avx-u32.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" ]
@@ -50138,16 +49792,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_f16c-fma-avx2") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.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" ]
@@ -50168,16 +49831,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.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" ]
@@ -50201,7 +49873,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_sse2-no-sse3") {
++  source_set("qs8-qc8w-igemm_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -50209,7 +49881,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.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" ]
@@ -50230,7 +49903,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_sse2-no-sse3_standalone") {
++  source_set("qs8-qc8w-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -50238,7 +49911,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.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" ]
@@ -50262,7 +49936,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
++  source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -50270,7 +49944,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.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" ]
@@ -50291,7 +49966,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -50299,7 +49974,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.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" ]
@@ -50323,15 +49999,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_ssse3-no-sse4.1") {
++  source_set("qs8-qc8w-igemm_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.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" ]
@@ -50352,15 +50028,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_ssse3-no-sse4.1_standalone") {
++  source_set("qs8-qc8w-igemm_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.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" ]
@@ -50384,14 +50060,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_x64") {
++  source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50412,14 +50092,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_x64_standalone") {
++  source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50443,17 +50127,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50474,17 +50162,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50508,76 +50200,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_sse2-no-sse3") {
++  source_set("qs8-qu8-packw_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qs8-vmul_sse4.1-no-sse4.2") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50598,15 +50228,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-qu8-packw_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50630,14 +50259,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_x64") {
++  source_set("qs8-rdsum_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-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50658,14 +50289,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_x64_standalone") {
++  source_set("qs8-rdsum_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-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50689,17 +50322,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50720,17 +50356,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50754,15 +50393,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_sse2-no-sse3") {
++  source_set("qs8-rdsum_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50783,15 +50422,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_sse2-no-sse3_standalone") {
++  source_set("qs8-rdsum_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50815,15 +50454,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_sse4.1-no-sse4.2") {
++  source_set("qs8-rdsum_x64") {
 +    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"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50844,15 +50482,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-rdsum_x64_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"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50876,14 +50513,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_x64") {
++  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50904,14 +50545,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_x64_standalone") {
++  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50935,7 +50580,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_f16c-fma-avx2") {
++  source_set("qs8-rsum_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -50944,7 +50589,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50965,7 +50610,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_f16c-fma-avx2_standalone") {
++  source_set("qs8-rsum_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -50974,7 +50619,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50998,14 +50643,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_x64") {
++  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.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" ]
@@ -51026,14 +50678,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_x64_standalone") {
++  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.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" ]
@@ -51057,16 +50716,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_f16c-fma-avx2") {
++  source_set("qs8-rsum_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-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51087,16 +50751,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_f16c-fma-avx2_standalone") {
++  source_set("qs8-rsum_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-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51120,75 +50789,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_f16c-fma-avx2") {
++  source_set("qs8-rsum_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51209,16 +50818,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_f16c-fma-avx2_standalone") {
++  source_set("qs8-rsum_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51242,14 +50850,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_x64") {
++  source_set("qs8-rsum_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51270,14 +50878,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_x64_standalone") {
++  source_set("qs8-rsum_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51301,7 +50909,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -51311,8 +50919,7 @@ Index: chromium-148.0.7778.96/third_party/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-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51333,7 +50940,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -51343,8 +50950,7 @@ Index: chromium-148.0.7778.96/third_party/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-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51368,7 +50974,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_f16c-fma-avx2") {
++  source_set("qs8-vadd_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -51377,8 +50983,7 @@ Index: chromium-148.0.7778.96/third_party/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-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51399,7 +51004,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_f16c-fma-avx2_standalone") {
++  source_set("qs8-vadd_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -51408,8 +51013,7 @@ Index: chromium-148.0.7778.96/third_party/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-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51433,7 +51037,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -51446,8 +51050,7 @@ Index: chromium-148.0.7778.96/third_party/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/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51468,7 +51071,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -51481,8 +51084,7 @@ Index: chromium-148.0.7778.96/third_party/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/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51506,7 +51108,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_sse2-no-sse3") {
++  source_set("qs8-vadd_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -51514,8 +51116,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse2-mul16.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51536,7 +51137,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_sse2-no-sse3_standalone") {
++  source_set("qs8-vadd_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -51544,8 +51145,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse2-mul16.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51569,7 +51169,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_sse4.1-no-sse4.2") {
++  source_set("qs8-vadd_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -51577,8 +51177,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse41-mul16.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51599,7 +51198,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-vadd_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -51607,8 +51206,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse41-mul16.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51632,17 +51230,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_x64") {
++  source_set("qs8-vadd_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-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" ]
@@ -51663,17 +51259,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_x64_standalone") {
++  source_set("qs8-vadd_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-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" ]
@@ -51697,7 +51291,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -51707,7 +51301,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51728,7 +51322,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -51738,7 +51332,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51762,7 +51356,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_f16c-fma-avx2") {
++  source_set("qs8-vaddc_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -51771,7 +51365,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51792,7 +51386,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_f16c-fma-avx2_standalone") {
++  source_set("qs8-vaddc_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -51801,7 +51395,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51825,7 +51419,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -51838,7 +51432,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51859,7 +51453,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -51872,7 +51466,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51896,7 +51490,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_sse2-no-sse3") {
++  source_set("qs8-vaddc_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -51904,7 +51498,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51925,7 +51519,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_sse2-no-sse3_standalone") {
++  source_set("qs8-vaddc_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -51933,7 +51527,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51957,7 +51551,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
++  source_set("qs8-vaddc_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -51965,7 +51559,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51986,7 +51580,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-vaddc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -51994,7 +51588,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52018,14 +51612,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_x64") {
++  source_set("qs8-vaddc_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52046,14 +51641,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_x64_standalone") {
++  source_set("qs8-vaddc_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52077,7 +51673,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -52087,8 +51683,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-2x4c8-minmax-fp32-avx-ld128.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52109,7 +51704,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -52119,8 +51714,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-2x4c8-minmax-fp32-avx-ld128.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52144,7 +51738,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_f16c-fma-avx2") {
++  source_set("qs8-vcvt_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -52153,8 +51747,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52175,7 +51768,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_f16c-fma-avx2_standalone") {
++  source_set("qs8-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -52184,8 +51777,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52209,21 +51801,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vcvt_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-vcvt/gen/qs8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52244,21 +51830,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-vcvt_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-vcvt/gen/qs8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52282,16 +51862,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_sse2-no-sse3") {
++  source_set("qs8-vcvt_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-vcvt/gen/qs8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52312,16 +51891,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_sse2-no-sse3_standalone") {
++  source_set("qs8-vcvt_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-vcvt/gen/qs8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52345,16 +51923,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_sse4.1-no-sse4.2") {
++  source_set("qs8-vcvt_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-vcvt/gen/qs8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52375,16 +51952,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-vcvt_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-vcvt/gen/qs8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52408,15 +51984,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_x64") {
++  source_set("qs8-vcvt_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52437,15 +52012,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_x64_standalone") {
++  source_set("qs8-vcvt_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52469,7 +52043,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -52479,8 +52053,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-avx-ld128.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-2x4c8-minmax-fp32-avx-ld128.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52501,7 +52074,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -52511,8 +52084,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-avx-ld128.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-2x4c8-minmax-fp32-avx-ld128.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52536,7 +52108,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_f16c-fma-avx2") {
++  source_set("qs8-vlrelu_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -52545,8 +52117,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x8c8-minmax-fp32-avx2.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x8c8-minmax-fp32-avx2.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52567,7 +52138,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_f16c-fma-avx2_standalone") {
++  source_set("qs8-vlrelu_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -52576,81 +52147,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x8c8-minmax-fp32-avx2.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x8c8-minmax-fp32-avx2.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/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_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") {
-+    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/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52674,7 +52171,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_sse2-no-sse3") {
++  source_set("qs8-vlrelu_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -52682,8 +52179,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-ld64.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52704,7 +52200,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_sse2-no-sse3_standalone") {
++  source_set("qs8-vlrelu_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -52712,8 +52208,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-ld64.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52737,7 +52232,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_sse4.1-no-sse4.2") {
++  source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -52745,8 +52240,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse41-ld64.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52767,7 +52261,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-vlrelu_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -52775,8 +52269,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse41-ld64.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52800,15 +52293,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_x64") {
++  source_set("qs8-vlrelu_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52829,15 +52322,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_x64_standalone") {
++  source_set("qs8-vlrelu_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52861,15 +52354,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_ssse3-no-sse4.1") {
++  source_set("qs8-vlrelu_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52890,15 +52382,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_ssse3-no-sse4.1_standalone") {
++  source_set("qs8-vlrelu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52922,14 +52413,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_x64") {
++  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/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52950,14 +52444,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_x64_standalone") {
++  source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52981,16 +52478,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_f16c-fma-avx2") {
++  source_set("qs8-vmul_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53011,16 +52507,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_f16c-fma-avx2_standalone") {
++  source_set("qs8-vmul_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53044,15 +52539,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_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-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53073,15 +52568,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_sse2-no-sse3_standalone") {
++  source_set("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-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53105,14 +52600,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_x64") {
++  source_set("qs8-vmul_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53133,14 +52628,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_x64_standalone") {
++  source_set("qs8-vmul_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53164,7 +52659,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -53174,7 +52669,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53195,7 +52690,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -53205,7 +52700,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53229,16 +52724,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_f16c-fma-avx2") {
++  source_set("qs8-vmulc_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53259,16 +52753,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_f16c-fma-avx2_standalone") {
++  source_set("qs8-vmulc_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53292,20 +52785,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vmulc_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53326,20 +52814,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-vmulc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53363,15 +52846,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_sse2-no-sse3") {
++  source_set("qs8-vmulc_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53392,15 +52874,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_sse2-no-sse3_standalone") {
++  source_set("qs8-vmulc_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53424,15 +52905,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_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-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53453,15 +52935,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-vprelu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53485,15 +52968,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_x64") {
++  source_set("qs8-vprelu_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/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53514,15 +52996,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_x64_standalone") {
++  source_set("qs8-vprelu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53546,17 +53027,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vpreluc_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/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53577,17 +53057,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-vpreluc_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/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53611,7 +53090,66 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_f16c-fma-avx2") {
++  source_set("qs8-vpreluc_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-vpreluc_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qs8-vrpreluc_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -53620,7 +53158,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53641,7 +53179,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_f16c-fma-avx2_standalone") {
++  source_set("qs8-vrpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -53650,7 +53188,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53674,20 +53212,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vrpreluc_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53708,20 +53240,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-vrpreluc_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53745,15 +53271,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_sse2-no-sse3") {
++  source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.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" ]
@@ -53774,15 +53303,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_sse2-no-sse3_standalone") {
++  source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.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" ]
@@ -53806,15 +53338,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_sse4.1-no-sse4.2") {
++  source_set("qu8-dwconv_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-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" ]
@@ -53835,15 +53369,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-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" ]
@@ -53867,15 +53403,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_x64") {
++  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-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.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" ]
@@ -53896,15 +53438,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_x64_standalone") {
++  source_set("qu8-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-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.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" ]
@@ -53928,17 +53476,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-dwconv_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.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" ]
@@ -53959,17 +53506,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qu8-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.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" ]
@@ -53993,16 +53539,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_f16c-fma-avx2") {
++  source_set("qu8-dwconv_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.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" ]
@@ -54023,16 +53569,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_f16c-fma-avx2_standalone") {
++  source_set("qu8-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.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" ]
@@ -54056,76 +53602,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# 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-dwconv_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qu8-vcvt_sse4.1-no-sse4.2") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c"
++      "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" ]
@@ -54146,15 +53633,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-dwconv_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.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" ]
@@ -54178,15 +53667,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_ssse3-no-sse4.1") {
++  source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54207,15 +53698,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_ssse3-no-sse4.1_standalone") {
++  source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54239,14 +53732,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_x64") {
++  source_set("qu8-f32-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54267,14 +53762,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_x64_standalone") {
++  source_set("qu8-f32-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54298,17 +53795,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54329,17 +53829,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qu8-f32-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/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54363,16 +53866,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_f16c-fma-avx2") {
++  source_set("qu8-f32-vcvt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54393,16 +53895,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_f16c-fma-avx2_standalone") {
++  source_set("qu8-f32-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54426,15 +53927,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_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-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54455,15 +53956,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_sse2-no-sse3_standalone") {
++  source_set("qu8-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-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54487,15 +53988,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_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-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54516,15 +54016,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-f32-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54548,15 +54047,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_ssse3-no-sse4.1") {
++  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.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" ]
@@ -54577,15 +54079,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_ssse3-no-sse4.1_standalone") {
++  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.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" ]
@@ -54609,14 +54114,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_x64") {
++  source_set("qu8-gemm_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.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" ]
@@ -54637,14 +54145,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_x64_standalone") {
++  source_set("qu8-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.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" ]
@@ -54668,17 +54179,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-gemm_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/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54699,17 +54214,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qu8-gemm_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/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54733,7 +54252,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_sse2-no-sse3") {
++  source_set("qu8-gemm_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -54741,7 +54260,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-ld64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54762,7 +54282,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_sse2-no-sse3_standalone") {
++  source_set("qu8-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -54770,7 +54290,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-ld64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54794,7 +54315,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_sse4.1-no-sse4.2") {
++  source_set("qu8-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -54802,7 +54323,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.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" ]
@@ -54823,7 +54345,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -54831,7 +54353,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.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" ]
@@ -54855,14 +54378,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_x64") {
++  source_set("qu8-gemm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54883,14 +54407,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_x64_standalone") {
++  source_set("qu8-gemm_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54914,7 +54439,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -54924,7 +54449,8 @@ Index: chromium-148.0.7778.96/third_party/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-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" ]
@@ -54945,7 +54471,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -54955,7 +54481,8 @@ Index: chromium-148.0.7778.96/third_party/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-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" ]
@@ -54979,7 +54506,145 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_sse2-no-sse3") {
++  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",
++    ]
++
++    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-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" ]
++    }
++  }
++}
++
++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") {
++    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"
@@ -54987,7 +54652,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-ld64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55008,7 +54674,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_sse2-no-sse3_standalone") {
++  source_set("qu8-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -55016,7 +54682,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-ld64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55040,7 +54707,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_sse4.1-no-sse4.2") {
++  source_set("qu8-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -55048,7 +54715,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.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" ]
@@ -55069,7 +54737,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-igemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -55077,7 +54745,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.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" ]
@@ -55101,14 +54770,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_x64") {
++  source_set("qu8-igemm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55129,14 +54799,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_x64_standalone") {
++  source_set("qu8-igemm_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55160,16 +54831,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_f16c-fma-avx2") {
++  source_set("qu8-rdsum_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55190,16 +54860,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_f16c-fma-avx2_standalone") {
++  source_set("qu8-rdsum_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55223,14 +54892,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_x64") {
++  source_set("qu8-rdsum_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55251,14 +54920,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_x64_standalone") {
++  source_set("qu8-rdsum_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55282,7 +54951,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_f16c-fma-avx2") {
++  source_set("qu8-rsum_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -55291,7 +54960,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55312,7 +54981,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_f16c-fma-avx2_standalone") {
++  source_set("qu8-rsum_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -55321,66 +54990,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qu8-vpreluc_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55404,16 +55014,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_f16c-fma-avx2") {
++  source_set("qu8-rsum_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55434,16 +55043,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_f16c-fma-avx2_standalone") {
++  source_set("qu8-rsum_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55467,14 +55075,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_x64") {
++  source_set("qu8-rsum_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55495,14 +55103,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_x64_standalone") {
++  source_set("qu8-rsum_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55526,16 +55134,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("reference_x64") {
++  source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55556,16 +55165,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("reference_x64_standalone") {
++  source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55589,15 +55199,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_sse2-no-sse3") {
++  source_set("qu8-vadd_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/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55618,15 +55229,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_sse2-no-sse3_standalone") {
++  source_set("qu8-vadd_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/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55650,15 +55262,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_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/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55679,15 +55296,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-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/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55711,14 +55333,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_x64") {
++  source_set("qu8-vadd_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55739,14 +55362,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_x64_standalone") {
++  source_set("qu8-vadd_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55770,7 +55394,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_sse4.1-no-sse4.2") {
++  source_set("qu8-vadd_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -55778,7 +55402,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55799,7 +55423,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vadd_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -55807,7 +55431,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55831,14 +55455,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_x64") {
++  source_set("qu8-vadd_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.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" ]
@@ -55859,14 +55484,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_x64_standalone") {
++  source_set("qu8-vadd_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.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" ]
@@ -55890,16 +55516,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_sse4.1-no-sse4.2") {
++  source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-sse41-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-sse41-u32.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55920,16 +55547,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-sse41-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-sse41-u32.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55953,15 +55581,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_x64") {
++  source_set("qu8-vaddc_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55982,15 +55611,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_x64_standalone") {
++  source_set("qu8-vaddc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56014,17 +55644,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_sse4.1-no-sse4.2") {
++  source_set("qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56045,17 +55678,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56079,16 +55715,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_x64") {
++  source_set("qu8-vaddc_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56109,16 +55744,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_x64_standalone") {
++  source_set("qu8-vaddc_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56142,16 +55776,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_f16c-fma-avx2") {
++  source_set("qu8-vaddc_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56172,16 +55805,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_f16c-fma-avx2_standalone") {
++  source_set("qu8-vaddc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56205,20 +55837,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-vaddc_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.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" ]
@@ -56239,20 +55866,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qu8-vaddc_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.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" ]
@@ -56276,15 +55898,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_sse2-no-sse3") {
++  source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56305,15 +55929,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_sse2-no-sse3_standalone") {
++  source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56337,15 +55963,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_sse4.1-no-sse4.2") {
++  source_set("qu8-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56366,15 +55993,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56398,14 +56026,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_x64") {
++  source_set("qu8-vcvt_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56426,14 +56055,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_x64_standalone") {
++  source_set("qu8-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56457,42 +56087,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("subgraph_x64") {
++  source_set("qu8-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/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-vcvt/gen/qu8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56513,42 +56116,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_x64_standalone") {
++  source_set("qu8-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/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-vcvt/gen/qu8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56572,22 +56148,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("tables_x64") {
++  source_set("qu8-vcvt_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-vcvt/gen/qu8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56608,22 +56177,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_x64_standalone") {
++  source_set("qu8-vcvt_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-vcvt/gen/qu8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56647,15 +56209,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_sse2-no-sse3") {
++  source_set("qu8-vcvt_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56676,15 +56237,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_sse2-no-sse3_standalone") {
++  source_set("qu8-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56708,15 +56268,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_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/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56737,15 +56299,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_sse4.1-no-sse4.2_standalone") {
++  source_set("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/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56769,14 +56333,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_x64") {
++  source_set("qu8-vlrelu_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56797,14 +56363,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_x64_standalone") {
++  source_set("qu8-vlrelu_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/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56828,14 +56396,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_x64") {
++  source_set("qu8-vlrelu_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56856,14 +56425,76 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_x64_standalone") {
++  source_set("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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# 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") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56887,15 +56518,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_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/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56916,15 +56547,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_sse2-no-sse3_standalone") {
++  source_set("qu8-vlrelu_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56948,14 +56579,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_x64") {
++  source_set("qu8-vlrelu_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56976,14 +56607,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_x64_standalone") {
++  source_set("qu8-vlrelu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57007,7 +56638,72 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_sse2-no-sse3") {
++  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-vmul/gen/qu8-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("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-vmul/gen/qu8-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("qu8-vmul_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -57015,8 +56711,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57037,7 +56732,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_sse2-no-sse3_standalone") {
++  source_set("qu8-vmul_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -57045,8 +56740,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    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-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57070,15 +56764,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_x64") {
++  source_set("qu8-vmul_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57099,15 +56793,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_x64_standalone") {
++  source_set("qu8-vmul_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57131,17 +56825,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_sse2-no-sse3") {
++  source_set("qu8-vmul_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    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-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57162,17 +56853,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_sse2-no-sse3_standalone") {
++  source_set("qu8-vmul_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    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-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57196,16 +56884,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_x64") {
++  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57226,16 +56915,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_x64_standalone") {
++  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57259,83 +56949,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +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",
-+    ]
-+
-+    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" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/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-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-vmulc_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/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57356,20 +56978,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qu8-vmulc_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/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57393,15 +57010,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_sse2-no-sse3") {
++  source_set("qu8-vmulc_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/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57422,15 +57039,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_sse2-no-sse3_standalone") {
++  source_set("qu8-vmulc_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/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57454,14 +57071,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_x64") {
++  source_set("qu8-vmulc_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57482,14 +57099,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_x64_standalone") {
++  source_set("qu8-vmulc_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57513,7 +57130,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-packw_f16c-fma-avx2") {
++  source_set("qu8-vprelu_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -57522,7 +57139,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57543,7 +57160,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_f16c-fma-avx2_standalone") {
++  source_set("qu8-vprelu_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -57552,7 +57169,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57576,16 +57193,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_f16c-fma-avx2") {
++  source_set("qu8-vprelu_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57606,16 +57221,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_f16c-fma-avx2_standalone") {
++  source_set("qu8-vprelu_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/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57639,15 +57252,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_sse2-no-sse3") {
++  source_set("qu8-vpreluc_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57668,15 +57282,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_sse2-no-sse3_standalone") {
++  source_set("qu8-vpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57700,14 +57315,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_x64") {
++  source_set("qu8-vpreluc_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57728,14 +57343,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_x64_standalone") {
++  source_set("qu8-vpreluc_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57759,15 +57374,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_x64") {
++  source_set("qu8-vrpreluc_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57788,15 +57404,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-x32-packw_x64_standalone") {
++  source_set("qu8-vrpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57820,15 +57437,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_ssse3-no-sse4.1") {
++  source_set("qu8-vrpreluc_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57849,15 +57465,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_ssse3-no-sse4.1_standalone") {
++  source_set("qu8-vrpreluc_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57881,14 +57496,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_x64") {
++  source_set("reference_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57909,14 +57526,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_x64_standalone") {
++  source_set("reference_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57940,21 +57559,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_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/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-ibilinear/gen/s8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57975,21 +57588,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("s8-ibilinear_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx-u8.c",
-+    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x16s4-gemm-goi-avx-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-gio-avx-u8.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58013,18 +57620,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_avx512f") {
++  source_set("s8-ibilinear_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-ibilinear/gen/s8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58045,18 +57649,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_avx512f_standalone") {
++  source_set("s8-ibilinear_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-ibilinear/gen/s8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58080,16 +57681,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_sse2-no-sse3") {
++  source_set("s8-ibilinear_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    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-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58110,16 +57709,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_sse2-no-sse3_standalone") {
++  source_set("s8-ibilinear_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    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-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58143,19 +57740,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_x64") {
++  source_set("s8-maxpool_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58176,19 +57769,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_x64_standalone") {
++  source_set("s8-maxpool_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58212,17 +57801,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma") {
++  source_set("s8-maxpool_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/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58243,17 +57829,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("s8-maxpool_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/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58277,15 +57860,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_sse-no-sse2") {
++  source_set("s8-rdminmax_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/x32-transposec-4x4-sse.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" ]
@@ -58306,15 +57890,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_sse-no-sse2_standalone") {
++  source_set("s8-rdminmax_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/x32-transposec-4x4-sse.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" ]
@@ -58338,14 +57923,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_x64") {
++  source_set("s8-rdminmax_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-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" ]
@@ -58366,14 +57952,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_x64_standalone") {
++  source_set("s8-rdminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-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" ]
@@ -58397,15 +57984,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_sse2-no-sse3") {
++  source_set("s8-rminmax_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-sse2.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" ]
@@ -58426,15 +58015,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_sse2-no-sse3_standalone") {
++  source_set("s8-rminmax_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/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" ]
@@ -58458,14 +58049,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_x64") {
++  source_set("s8-rminmax_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.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" ]
@@ -58486,14 +58079,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_x64_standalone") {
++  source_set("s8-rminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.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" ]
@@ -58517,17 +58112,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma") {
++  source_set("s8-vclamp_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
++      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58548,17 +58142,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("s8-vclamp_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
++      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58582,7 +58175,78 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_sse2-no-sse3") {
++  source_set("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/s8-vclamp/s8-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",
++      "//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("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/s8-vclamp/s8-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",
++      "//third_party/fxdiv",
++      "//third_party/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"
@@ -58590,7 +58254,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
++      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58611,7 +58275,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_sse2-no-sse3_standalone") {
++  source_set("s8-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -58619,7 +58283,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
++      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58643,14 +58307,75 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_x64") {
++  source_set("s8-vclamp_sse4.1-no-sse4.2") {
 +    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    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") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("s8-vclamp_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58671,14 +58396,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_x64_standalone") {
++  source_set("s8-vclamp_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58702,17 +58427,42 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_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/x8-lut/gen/x8-lut-avx-u64.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/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" ]
@@ -58733,17 +58483,42 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("subgraph_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx-u64.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/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" ]
@@ -58767,16 +58542,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx2") {
++  source_set("tables_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx2-u128.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" ]
@@ -58797,16 +58578,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_f16c-fma-avx2_standalone") {
++  source_set("tables_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx2-u128.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" ]
@@ -58830,20 +58617,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("u8-ibilinear_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-ibilinear/gen/u8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58864,20 +58646,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("u8-ibilinear_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-ibilinear/gen/u8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58901,21 +58678,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi") {
++  source_set("u8-ibilinear_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vbmi",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58936,21 +58707,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi_standalone") {
++  source_set("u8-ibilinear_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vbmi",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58974,14 +58739,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_x64") {
++  source_set("u8-ibilinear_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59002,14 +58767,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_x64_standalone") {
++  source_set("u8-ibilinear_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59033,14 +58798,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packq_x64") {
++  source_set("u8-lut32norm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59061,14 +58826,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_x64_standalone") {
++  source_set("u8-lut32norm_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59092,17 +58857,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packw_x64") {
++  source_set("u8-maxpool_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59123,17 +58886,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packw_x64_standalone") {
++  source_set("u8-maxpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59157,16 +58918,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_f16c-fma-avx2") {
++  source_set("u8-maxpool_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59187,16 +58946,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_f16c-fma-avx2_standalone") {
++  source_set("u8-maxpool_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59220,7 +58977,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_sse2-no-sse3") {
++  source_set("u8-rdminmax_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -59228,7 +58985,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.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" ]
@@ -59249,7 +59007,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_sse2-no-sse3_standalone") {
++  source_set("u8-rdminmax_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -59257,7 +59015,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.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" ]
@@ -59281,14 +59040,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_x64") {
++  source_set("u8-rdminmax_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.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" ]
@@ -59309,14 +59069,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_x64_standalone") {
++  source_set("u8-rdminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.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" ]
@@ -59340,14 +59101,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-copy_x64") {
++  source_set("u8-rminmax_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.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" ]
@@ -59368,14 +59132,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_x64_standalone") {
++  source_set("u8-rminmax_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.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" ]
@@ -59399,15 +59166,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-fill_sse2-no-sse3") {
++  source_set("u8-rminmax_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-sse2-u64.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" ]
@@ -59428,15 +59196,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_sse2-no-sse3_standalone") {
++  source_set("u8-rminmax_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-sse2-u64.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" ]
@@ -59460,14 +59229,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-fill_x64") {
++  source_set("u8-vclamp_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59488,14 +59259,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_x64_standalone") {
++  source_set("u8-vclamp_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59519,15 +59292,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-pad_sse2-no-sse3") {
++  source_set("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p16-sse2-u16.c"
++      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59548,15 +59326,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_sse2-no-sse3_standalone") {
++  source_set("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p16-sse2-u16.c"
++      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59580,14 +59363,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-pad_x64") {
++  source_set("u8-vclamp_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59608,14 +59392,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_x64_standalone") {
++  source_set("u8-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59639,14 +59424,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-transposev_x64") {
++  source_set("u8-vclamp_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59667,14 +59452,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-transposev_x64_standalone") {
++  source_set("u8-vclamp_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59697,41 +59482,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  }
 +}
 +
-+}
-+
-+if (current_cpu == "arm64") {
 +if (build_with_chromium) {
-+  source_set("configs_arm64") {
++  source_set("x16-packw_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59752,37 +59513,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("configs_arm64_standalone") {
++  source_set("x16-packw_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59806,18 +59546,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("enums_arm64") {
++  source_set("x16-transposec_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/enums/allocation-type.c",
-+    "src/src/enums/datatype-strings.c",
-+    "src/src/enums/microkernel-type.c",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
++      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59838,18 +59576,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("enums_arm64_standalone") {
++  source_set("x16-transposec_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/enums/allocation-type.c",
-+    "src/src/enums/datatype-strings.c",
-+    "src/src/enums/microkernel-type.c",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
++      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59873,14 +59609,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-avgpool_arch=armv8.2-a+fp16") {
++  source_set("x16-transposec_sse2-no-sse3") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
++      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59901,14 +59638,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-avgpool_arch=armv8.2-a+fp16_standalone") {
++  source_set("x16-transposec_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
++      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59932,14 +59670,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
++  source_set("x16-transposec_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59960,14 +59698,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") {
++  source_set("x16-transposec_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59991,17 +59729,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
++  source_set("x16-x32-packw_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c"
++      "src/src/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" ]
@@ -60022,17 +59758,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") {
++  source_set("x16-x32-packw_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c"
++      "src/src/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" ]
@@ -60056,18 +59790,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_arch=armv8.2-a+fp16") {
++  source_set("x24-transposec_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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/x24-transposec/x24-transposec-4x4-ssse3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60088,18 +59819,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") {
++  source_set("x24-transposec_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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/x24-transposec/x24-transposec-4x4-ssse3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60123,16 +59851,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_arm64") {
++  source_set("x24-transposec_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
-+    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
-+    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60153,16 +59879,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_arm64_standalone") {
++  source_set("x24-transposec_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
-+    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
-+    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60186,14 +59910,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16") {
++  source_set("x32-packw_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-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.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" ]
@@ -60214,14 +59945,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
++  source_set("x32-packw_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-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.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" ]
@@ -60245,14 +59983,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
++  source_set("x32-packw_avx512f") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-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" ]
@@ -60273,14 +60015,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") {
++  source_set("x32-packw_avx512f_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-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" ]
@@ -60304,14 +60050,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
++  source_set("x32-packw_sse2-no-sse3") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.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" ]
@@ -60332,14 +60080,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16_standalone") {
++  source_set("x32-packw_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.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" ]
@@ -60363,76 +60113,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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=armv8.2-a+fp16_standalone") {
++  source_set("x32-packw_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16") {
-+    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/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" ]
@@ -60453,17 +60146,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("x32-packw_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/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" ]
@@ -60487,21 +60182,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
-+  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/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60522,21 +60213,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
-+  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/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60560,14 +60247,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
++  source_set("x32-transposec_sse-no-sse2") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
++      "src/src/x32-transposec/x32-transposec-4x4-sse.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60588,14 +60276,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") {
++  source_set("x32-transposec_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
++      "src/src/x32-transposec/x32-transposec-4x4-sse.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60619,14 +60308,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear_arch=armv8.2-a+fp16") {
++  source_set("x32-transposec_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60647,14 +60336,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-ibilinear_arch=armv8.2-a+fp16_standalone") {
++  source_set("x32-transposec_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60678,17 +60367,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16") {
++  source_set("x32-unpool_sse2-no-sse3") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/x32-unpool/x32-unpool-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60709,17 +60396,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("x32-unpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/x32-unpool/x32-unpool-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60743,21 +60428,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("x32-unpool_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/x32-unpool/x32-unpool-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60778,21 +60456,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("x32-unpool_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-igemm/f16-igemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60816,14 +60487,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_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-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60844,14 +60518,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-maxpool_arch=armv8.2-a+fp16_standalone") {
++  source_set("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-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60875,14 +60552,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_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-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
++      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60903,14 +60581,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16_standalone") {
++  source_set("x64-transposec_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/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60934,14 +60613,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_arm64") {
++  source_set("x64-transposec_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60962,14 +60641,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_arm64_standalone") {
++  source_set("x64-transposec_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60993,14 +60672,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qu8-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-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/x8-lut/gen/x8-lut-avx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61021,14 +60703,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qu8-vcvt_arm64_standalone") {
++  source_set("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-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/x8-lut/gen/x8-lut-avx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61052,14 +60737,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
++      "src/src/x8-lut/gen/x8-lut-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61080,14 +60767,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone") {
++  source_set("x8-lut_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
++      "src/src/x8-lut/gen/x8-lut-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61111,15 +60800,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_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-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-u32.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-u32.c"
++      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61140,15 +60834,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_arch=armv8.2-a+fp16_standalone") {
++  source_set("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-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-u32.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-u32.c"
++      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61172,15 +60871,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_arm64") {
++  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vbmi",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61201,15 +60906,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_arm64_standalone") {
++  source_set("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/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61233,16 +60944,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arch=armv8.2-a+fp16") {
++  source_set("x8-lut_x64") {
 +    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/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61263,16 +60972,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_arch=armv8.2-a+fp16_standalone") {
++  source_set("x8-lut_x64_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/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61296,16 +61003,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arm64") {
++  source_set("x8-packq_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"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61326,16 +61031,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_arm64_standalone") {
++  source_set("x8-packq_x64_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/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61359,14 +61062,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-spmm_arch=armv8.2-a+fp16") {
++  source_set("x8-packw_x64") {
 +    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/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" ]
@@ -61387,14 +61093,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-spmm_arch=armv8.2-a+fp16_standalone") {
++  source_set("x8-packw_x64_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/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" ]
@@ -61418,14 +61127,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61446,14 +61157,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_arch=armv8.2-a+fp16_standalone") {
++  source_set("x8-transposec_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61477,14 +61190,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_arm64") {
++  source_set("x8-transposec_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61505,14 +61219,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_arm64_standalone") {
++  source_set("x8-transposec_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61536,35 +61251,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_arch=armv8.2-a+fp16") {
++  source_set("x8-transposec_x64") {
 +    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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61585,35 +61279,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_arch=armv8.2-a+fp16_standalone") {
++  source_set("x8-transposec_x64_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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61637,14 +61310,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_arch=armv8.2-a+fp16") {
++  source_set("xx-copy_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61665,14 +61338,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vclamp_arch=armv8.2-a+fp16_standalone") {
++  source_set("xx-copy_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61696,14 +61369,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcmul_arch=armv8.2-a+fp16") {
++  source_set("xx-fill_sse2-no-sse3") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
++      "src/src/xx-fill/xx-fill-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61724,14 +61398,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcmul_arch=armv8.2-a+fp16_standalone") {
++  source_set("xx-fill_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
++      "src/src/xx-fill/xx-fill-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61755,14 +61430,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_arch=armv8.2-a+fp16") {
++  source_set("xx-fill_x64") {
 +    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/xx-fill/xx-fill-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61783,14 +61458,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_arch=armv8.2-a+fp16_standalone") {
++  source_set("xx-fill_x64_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/xx-fill/xx-fill-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61814,14 +61489,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_arm64") {
++  source_set("xx-pad_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/xx-pad/xx-pad-p16-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61842,14 +61518,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_arm64_standalone") {
++  source_set("xx-pad_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/xx-pad/xx-pad-p16-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61873,73 +61550,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-velu_arch=armv8.2-a+fp16") {
++  source_set("xx-pad_x64") {
 +    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",
-+    ]
-+
-+    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=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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/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=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/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61960,14 +61578,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_arch=armv8.2-a+fp16_standalone") {
++  source_set("xx-pad_x64_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/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61991,14 +61609,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_arm64") {
++  source_set("xx-transposev_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62019,14 +61637,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_arm64_standalone") {
++  source_set("xx-transposev_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62049,15 +61667,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  }
 +}
 +
++}
++
++if (current_cpu == "arm64") {
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_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-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.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" ]
@@ -62078,14 +61700,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_arch=armv8.2-a+fp16_standalone") {
++  source_set("bf16-f32-vcvt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/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" ]
@@ -62109,14 +61732,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_arm64") {
++  source_set("bf16-qs8-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62137,14 +61760,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_arm64_standalone") {
++  source_set("bf16-qs8-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62168,14 +61791,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_arch=armv8.2-a+fp16") {
++  source_set("bf16-rminmax_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.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" ]
@@ -62196,14 +61824,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vhswish_arch=armv8.2-a+fp16_standalone") {
++  source_set("bf16-rminmax_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.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" ]
@@ -62227,14 +61860,37 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_arch=armv8.2-a+fp16") {
++  source_set("configs_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.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" ]
@@ -62255,14 +61911,37 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlrelu_arch=armv8.2-a+fp16_standalone") {
++  source_set("configs_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.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" ]
@@ -62286,14 +61965,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_arch=armv8.2-a+fp16") {
++  source_set("enums_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
++      "src/src/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" ]
@@ -62314,14 +61997,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vmulcaddc_arch=armv8.2-a+fp16_standalone") {
++  source_set("enums_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
++      "src/src/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" ]
@@ -62345,17 +62032,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_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-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-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62376,17 +62060,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vrnd_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-avgpool_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-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62410,14 +62091,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_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-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
++      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62438,14 +62119,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-conv-hwc2chw_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-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62469,15 +62150,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_arch=armv8.2-a+fp16") {
++  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-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-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" ]
@@ -62498,15 +62181,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c",
-+    "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c"
++      "src/src/f16-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" ]
@@ -62530,14 +62215,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsin_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-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.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" ]
@@ -62558,14 +62247,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c"
++      "src/src/f16-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" ]
@@ -62589,14 +62282,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsin_arm64") {
++  source_set("f16-f32-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.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" ]
@@ -62617,14 +62312,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_arm64_standalone") {
++  source_set("f16-f32-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.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" ]
@@ -62648,15 +62345,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_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-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
-+    "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62677,15 +62373,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-f32acc-rdsum2_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-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62709,15 +62404,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_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-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-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62738,15 +62432,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
-+    "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62770,16 +62463,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vunary_arch=armv8.2-a+fp16") {
++  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-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-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62800,16 +62491,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-f32acc-rsum2_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-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62833,15 +62522,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_arm64") {
++  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
-+    "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62862,15 +62550,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_arm64_standalone") {
++  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
-+    "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62894,15 +62581,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_arm64") {
++  source_set("f16-gemm_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-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" ]
@@ -62923,15 +62612,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_arm64_standalone") {
++  source_set("f16-gemm_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-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" ]
@@ -62955,92 +62646,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c",
-+    "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c",
-+    "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_arm64_standalone") {
++  source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c",
-+    "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c",
-+    "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
++  asmflags = cflags
 +
-+if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-aarch64-neonfma-3x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-neon-2x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-aarch64-neonfma-2x4-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-neon-1x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-aarch64-neonfma-4x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-neon-1x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-aarch64-neonfma-1x4-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-neon-1x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "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" ]
@@ -63061,29 +62681,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_arm64_standalone") {
++  source_set("f16-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-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-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" ]
@@ -63107,16 +62719,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
++      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63137,16 +62747,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
++      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63170,31 +62778,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arm64") {
++  source_set("f16-ibilinear_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-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63215,31 +62806,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_arm64_standalone") {
++  source_set("f16-ibilinear_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-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63263,16 +62837,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_arm64") {
++  source_set("f16-igemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neon-u8.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neonfp16-u16.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f16-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" ]
@@ -63293,16 +62868,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_arm64_standalone") {
++  source_set("f16-igemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neon-u8.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neonfp16-u16.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f16-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" ]
@@ -63326,7 +62902,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -63335,27 +62911,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +    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-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" ]
@@ -63376,7 +62937,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -63385,27 +62946,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +    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-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" ]
@@ -63429,32 +62975,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arm64") {
++  source_set("f16-maxpool_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-relu-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-relu-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-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63475,32 +63003,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_arm64_standalone") {
++  source_set("f16-maxpool_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-relu-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-relu-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-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63524,16 +63034,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_arm64") {
++  source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63554,16 +63062,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_arm64_standalone") {
++  source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63587,16 +63093,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_arm64") {
++  source_set("f16-qs8-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-neon-u8.c",
-+    "src/src/f32-ibilinear/gen/f32-ibilinear-neonfma-u8.c",
-+    "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63617,16 +63121,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear_arm64_standalone") {
++  source_set("f16-qs8-vcvt_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-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63650,33 +63152,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-qu8-vcvt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-ld64.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-ld128.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-ld128.S"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63697,33 +63180,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f16-qu8-vcvt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-ld64.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-ld128.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-ld128.S"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63747,32 +63211,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arm64") {
++  source_set("f16-raddstoreexpminusmax_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-relu-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-relu-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-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63793,32 +63239,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_arm64_standalone") {
++  source_set("f16-raddstoreexpminusmax_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-relu-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-relu-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-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63842,15 +63270,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_arm64") {
++  source_set("f16-rdminmax_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-neon-u4.c",
-+    "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f16-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" ]
@@ -63871,15 +63299,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_arm64_standalone") {
++  source_set("f16-rdminmax_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-neon-u4.c",
-+    "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f16-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" ]
@@ -63903,20 +63331,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_arm64") {
++  source_set("f16-rdminmax_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/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" ]
@@ -63937,20 +63360,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc4w-gemm_arm64_standalone") {
++  source_set("f16-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c"
++      "src/src/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" ]
@@ -63974,18 +63392,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-rminmax_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-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" ]
@@ -64006,18 +63422,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f16-rminmax_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-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" ]
@@ -64041,19 +63455,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_arm64") {
++  source_set("f16-rminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-aarch64-neonfma-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-aarch64-neonfma-lane-ld64.c"
++      "src/src/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" ]
@@ -64074,19 +63485,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_arm64_standalone") {
++  source_set("f16-rminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-aarch64-neonfma-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-aarch64-neonfma-lane-ld64.c"
++      "src/src/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" ]
@@ -64110,17 +63518,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_arm64") {
++  source_set("f16-spmm_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-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64141,17 +63546,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_arm64_standalone") {
++  source_set("f16-spmm_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-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64175,17 +63577,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_arm64") {
++  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64206,17 +63605,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_arm64_standalone") {
++  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64240,15 +63636,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_arm64") {
++  source_set("f16-vapproxgelu_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/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64269,15 +63664,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_arm64_standalone") {
++  source_set("f16-vapproxgelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-neonfma-rr1-lut64-p2-u16-acc2.c",
-+    "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64301,17 +63695,35 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_arm64") {
++  source_set("f16-vbinary_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -64332,17 +63744,35 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_arm64_standalone") {
++  source_set("f16-vbinary_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -64366,15 +63796,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_arm64") {
++  source_set("f16-vclamp_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-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64395,15 +63824,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_arm64_standalone") {
++  source_set("f16-vclamp_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-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64427,15 +63855,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_arm64") {
++  source_set("f16-vcmul_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64456,15 +63883,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_arm64_standalone") {
++  source_set("f16-vcmul_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64488,19 +63914,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_arm64") {
++  source_set("f16-vcos_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-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64521,19 +63942,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_arm64_standalone") {
++  source_set("f16-vcos_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-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64557,15 +63973,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_arm64") {
++  source_set("f16-vcos_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-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64586,15 +64001,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_arm64_standalone") {
++  source_set("f16-vcos_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-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64618,15 +64032,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rsum_arm64") {
++  source_set("f16-velu_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-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64647,15 +64060,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_arm64_standalone") {
++  source_set("f16-velu_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-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64679,20 +64091,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-spmm_arm64") {
++  source_set("f16-vexp_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64713,20 +64119,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_arm64_standalone") {
++  source_set("f16-vexp_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64750,15 +64150,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_arm64") {
++  source_set("f16-vexp_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/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64779,15 +64178,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_arm64_standalone") {
++  source_set("f16-vexp_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/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64811,51 +64209,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_arm64") {
++  source_set("f16-vgelu_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64876,51 +64237,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_arm64_standalone") {
++  source_set("f16-vgelu_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64944,15 +64268,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_arm64") {
++  source_set("f16-vgelu_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/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64973,15 +64296,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_arm64_standalone") {
++  source_set("f16-vgelu_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/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65005,15 +64327,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_arm64") {
++  source_set("f16-vhswish_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+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/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65034,15 +64355,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_arm64_standalone") {
++  source_set("f16-vhswish_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+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/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65066,19 +64386,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_arm64") {
++  source_set("f16-vlrelu_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65099,19 +64414,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_arm64_standalone") {
++  source_set("f16-vlrelu_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65135,15 +64445,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcos_arm64") {
++  source_set("f16-vmulcaddc_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65164,15 +64473,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_arm64_standalone") {
++  source_set("f16-vmulcaddc_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65196,17 +64504,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-velu_arm64") {
++  source_set("f16-vrnd_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+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/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" ]
@@ -65227,17 +64535,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_arm64_standalone") {
++  source_set("f16-vrnd_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+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/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" ]
@@ -65261,15 +64569,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vexp_arm64") {
++  source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65290,15 +64597,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_arm64_standalone") {
++  source_set("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65322,15 +64628,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_arm64") {
++  source_set("f16-vsigmoid_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -65351,15 +64657,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_arm64_standalone") {
++  source_set("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -65383,15 +64689,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_arm64") {
++  source_set("f16-vsin_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65412,15 +64717,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_arm64_standalone") {
++  source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65444,15 +64748,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlog_arm64") {
++  source_set("f16-vsin_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/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65473,15 +64776,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_arm64_standalone") {
++  source_set("f16-vsin_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/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65505,15 +64807,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_arm64") {
++  source_set("f16-vsqrt_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -65534,15 +64836,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_arm64_standalone") {
++  source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -65566,16 +64868,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_arm64") {
++  source_set("f16-vtanh_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+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/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" ]
@@ -65596,16 +64897,78 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_arm64_standalone") {
++  source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
++      "-march=armv8.2-a+fp16"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
++    "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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-vunary_arch=armv8.2-a+fp16") {
++    cflags = [
++      "-march=armv8.2-a+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/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
++    "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") {
++    cflags = [
++      "-march=armv8.2-a+fp16"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/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" ]
@@ -65629,25 +64992,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_arm64") {
++  source_set("f32-argmaxpool_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-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
++    "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65668,25 +65021,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_arm64_standalone") {
++  source_set("f32-argmaxpool_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-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
++    "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65710,16 +65053,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_arm64") {
++  source_set("f32-avgpool_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-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" ]
@@ -65740,16 +65082,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_arm64_standalone") {
++  source_set("f32-avgpool_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-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" ]
@@ -65773,16 +65114,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_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-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-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65803,16 +65142,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_arm64_standalone") {
++  source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+bf16"
 +    ]
 +  
 +    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-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65836,15 +65173,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_arm64") {
++  source_set("f32-bf16-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-neon-rational-5-4-div.c",
-+    "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-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" ]
@@ -65865,15 +65202,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_arm64_standalone") {
++  source_set("f32-bf16-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-neon-rational-5-4-div.c",
-+    "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-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" ]
@@ -65897,15 +65234,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_arm64") {
++  source_set("f32-conv-hwc2chw_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-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" ]
@@ -65926,15 +65264,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_arm64_standalone") {
++  source_set("f32-conv-hwc2chw_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-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" ]
@@ -65958,15 +65297,29 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_arm64") {
++  source_set("f32-dwconv2d-chw_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-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" ]
@@ -65987,15 +65340,29 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_arm64_standalone") {
++  source_set("f32-dwconv2d-chw_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-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" ]
@@ -66019,19 +65386,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_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-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-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66052,19 +65416,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_arm64_standalone") {
++  source_set("f32-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-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-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66088,36 +65449,31 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("operators_arm64") {
++  source_set("f32-dwconv_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-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" ]
@@ -66138,36 +65494,31 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("operators_arm64_standalone") {
++  source_set("f32-dwconv_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-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" ]
@@ -66191,15 +65542,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-f16-vcvt_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-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" ]
@@ -66220,15 +65572,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-f16-vcvt_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-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" ]
@@ -66252,17 +65605,36 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-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/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-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" ]
@@ -66283,17 +65655,36 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-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/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-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" ]
@@ -66317,17 +65708,30 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-gemm_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-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" ]
@@ -66348,17 +65752,30 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-gemm_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-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" ]
@@ -66382,15 +65799,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf32-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-ibilinear-chw_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-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" ]
@@ -66411,15 +65829,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pf32-igemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-ibilinear-chw_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-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" ]
@@ -66443,15 +65862,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-ibilinear_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-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" ]
@@ -66472,15 +65892,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-ibilinear_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-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" ]
@@ -66504,16 +65925,33 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-igemm_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/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-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" ]
@@ -66534,16 +65972,33 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-igemm_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/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-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" ]
@@ -66567,15 +66022,30 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qb4-packw_arch=armv8.2-a+dotprod") {
++  source_set("f32-igemm_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-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" ]
@@ -66596,15 +66066,30 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") {
++  source_set("f32-igemm_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-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" ]
@@ -66628,15 +66113,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-maxpool_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-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" ]
@@ -66657,15 +66142,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("f32-maxpool_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-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" ]
@@ -66689,15 +66174,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") {
++  source_set("f32-qc4w-gemm_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-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" ]
@@ -66718,15 +66208,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("f32-qc4w-gemm_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-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" ]
@@ -66750,15 +66245,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -66779,15 +66277,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -66811,16 +66312,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-qc8w-gemm_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-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" ]
@@ -66841,16 +66345,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("f32-qc8w-gemm_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-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" ]
@@ -66874,14 +66381,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_arm64") {
++  source_set("f32-qs8-vcvt_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-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" ]
@@ -66902,14 +66412,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_arm64_standalone") {
++  source_set("f32-qs8-vcvt_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-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" ]
@@ -66933,15 +66446,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-qu8-vcvt_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-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" ]
@@ -66962,15 +66477,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("f32-qu8-vcvt_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-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" ]
@@ -66994,15 +66511,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16") {
++  source_set("f32-raddstoreexpminusmax_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-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" ]
@@ -67023,15 +66540,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("f32-raddstoreexpminusmax_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-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" ]
@@ -67055,15 +66572,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-rdminmax_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-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" ]
@@ -67084,15 +66603,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("f32-rdminmax_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-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" ]
@@ -67116,17 +66637,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-rdsum2_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-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" ]
@@ -67147,17 +66666,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("f32-rdsum2_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-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" ]
@@ -67181,15 +66698,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16") {
++  source_set("f32-rdsum_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-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" ]
@@ -67210,15 +66727,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("f32-rdsum_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-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" ]
@@ -67242,17 +66759,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f32-rminmax_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-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" ]
@@ -67273,17 +66792,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f32-rminmax_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-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" ]
@@ -67307,15 +66828,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-neon.c",
++    "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67336,15 +66857,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-neon.c",
++    "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67368,17 +66889,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-rsum_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-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" ]
@@ -67399,17 +66918,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("f32-rsum_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-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" ]
@@ -67433,15 +66950,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
++  source_set("f32-spmm_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-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" ]
@@ -67462,15 +66984,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("f32-spmm_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-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" ]
@@ -67494,17 +67021,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f32-vapproxgelu_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-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" ]
@@ -67525,17 +67050,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f32-vapproxgelu_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-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" ]
@@ -67559,15 +67082,51 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vbinary_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-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" ]
@@ -67588,15 +67147,51 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("f32-vbinary_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-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" ]
@@ -67620,15 +67215,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("f32-vclamp_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-vclamp/gen/f32-vclamp-neon.c",
++    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67649,15 +67244,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("f32-vclamp_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-vclamp/gen/f32-vclamp-neon.c",
++    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67681,15 +67276,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vcmul_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-vcmul/gen/f32-vcmul-neon-u8.c",
++    "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67710,15 +67305,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("f32-vcmul_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-vcmul/gen/f32-vcmul-neon-u8.c",
++    "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67742,17 +67337,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arm64") {
++  source_set("f32-vcopysign_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-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" ]
@@ -67773,17 +67370,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_arm64_standalone") {
++  source_set("f32-vcopysign_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-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" ]
@@ -67807,16 +67406,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("f32-vcos_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-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" ]
@@ -67837,16 +67435,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("f32-vcos_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-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" ]
@@ -67870,14 +67467,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_arm64") {
++  source_set("f32-velu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.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" ]
@@ -67898,14 +67498,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_arm64_standalone") {
++  source_set("f32-velu_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/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" ]
@@ -67929,15 +67532,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("f32-vexp_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c"
++      "src/src/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" ]
@@ -67958,15 +67561,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("f32-vexp_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c"
++      "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" ]
@@ -67990,15 +67593,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vgelu_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/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" ]
@@ -68019,15 +67622,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("f32-vgelu_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/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" ]
@@ -68051,17 +67654,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arm64") {
++  source_set("f32-vhswish_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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/f32-vhswish/gen/f32-vhswish-neon.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68082,17 +67683,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
++  source_set("f32-vhswish_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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/f32-vhswish/gen/f32-vhswish-neon.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68116,17 +67715,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("f32-vlog_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    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/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" ]
@@ -68147,17 +67744,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("f32-vlog_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    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/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" ]
@@ -68181,17 +67776,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f32-vlrelu_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  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/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
++    "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68212,17 +67805,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f32-vlrelu_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  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/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
++    "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68246,15 +67837,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vmulcaddc_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/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" ]
@@ -68275,15 +67867,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("f32-vmulcaddc_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/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" ]
@@ -68307,20 +67900,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arm64") {
++  source_set("f32-vrnd_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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/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" ]
@@ -68341,20 +67939,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arm64_standalone") {
++  source_set("f32-vrnd_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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/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" ]
@@ -68378,17 +67981,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod") {
++  source_set("f32-vrsqrt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    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/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" ]
@@ -68409,17 +68011,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("f32-vrsqrt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    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/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" ]
@@ -68443,80 +68044,16 @@ Index: chromium-148.0.7778.96/third_party/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"
-+    ]
-+  
-+  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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f32-vsigmoid_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
-+    ]
 +  
-+  asmflags = cflags
-+
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/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_arch=armv8.2-a+i8mm+fp16") {
-+    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/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" ]
@@ -68537,15 +68074,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("f32-vsigmoid_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/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" ]
@@ -68569,22 +68107,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arm64") {
++  source_set("f32-vsin_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/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" ]
@@ -68605,22 +68136,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_arm64_standalone") {
++  source_set("f32-vsin_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/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" ]
@@ -68644,16 +68168,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("f32-vsqrt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
-+    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
-+    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c"
++      "src/src/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" ]
@@ -68674,16 +68197,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("f32-vsqrt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
-+    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
-+    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c"
++      "src/src/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" ]
@@ -68707,14 +68229,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vtanh_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
++      "src/src/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" ]
@@ -68735,14 +68258,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("f32-vtanh_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
++      "src/src/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" ]
@@ -68766,16 +68290,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("f32-vunary_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x4c8s2-mstep4-aarch64-neondot.c",
-+    "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
-+    "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x8c16s2-aarch64-neondot.c"
++      "src/src/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" ]
@@ -68796,16 +68323,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("f32-vunary_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x4c8s2-mstep4-aarch64-neondot.c",
-+    "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
-+    "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x8c16s2-aarch64-neondot.c"
++      "src/src/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" ]
@@ -68829,14 +68359,36 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("operators_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
++      "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" ]
@@ -68857,14 +68409,36 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("operators_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
++      "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" ]
@@ -68888,15 +68462,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
 +      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    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/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" ]
@@ -68917,15 +68491,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("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/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/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" ]
@@ -68949,16 +68523,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-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/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" ]
@@ -68979,16 +68554,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-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/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" ]
@@ -69012,14 +68588,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
++      "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c",
++    "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c",
++    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c",
++    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69040,14 +68619,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
++      "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c",
++    "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c",
++    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c",
++    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69071,17 +68653,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("pf32-igemm_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"
++      "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" ]
@@ -69102,17 +68682,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("pf32-igemm_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/pf32-igemm/pf32-igemm-32x32-minmax-neonsme.c",
++    "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69136,20 +68714,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_arm64") {
++  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/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/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" ]
@@ -69170,20 +68743,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_arm64_standalone") {
++  source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    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/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" ]
@@ -69207,14 +68775,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16") {
++  source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.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" ]
@@ -69235,14 +68805,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16_standalone") {
++  source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.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" ]
@@ -69266,15 +68838,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_arm64") {
++  source_set("qb4-packw_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/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" ]
@@ -69295,15 +68867,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_arm64_standalone") {
++  source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/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" ]
@@ -69327,17 +68899,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_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/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-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" ]
@@ -69358,17 +68928,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_arm64_standalone") {
++  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod+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-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" ]
@@ -69392,15 +68960,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -69421,15 +68989,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qd8-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/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-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" ]
@@ -69453,17 +69021,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_arm64") {
++  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -69484,17 +69050,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_arm64_standalone") {
++  source_set("qd8-f16-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-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" ]
@@ -69518,17 +69082,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S"
++      "src/src/qd8-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" ]
@@ -69549,17 +69112,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S"
++      "src/src/qd8-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" ]
@@ -69583,15 +69145,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_arm64") {
++  source_set("qd8-f16-qc2w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69612,15 +69173,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_arm64_standalone") {
++  source_set("qd8-f16-qc2w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69644,27 +69204,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_arm64") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -69685,27 +69233,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_arm64_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -69729,17 +69265,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -69760,17 +69294,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -69794,25 +69326,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f16-qc4w-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/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-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" ]
@@ -69833,25 +69355,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qd8-f16-qc4w-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/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-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" ]
@@ -69875,15 +69387,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-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/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-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" ]
@@ -69904,15 +69418,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("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/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-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" ]
@@ -69936,20 +69452,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arm64") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -69970,20 +69481,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arm64_standalone") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -70007,17 +69513,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_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/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-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" ]
@@ -70038,17 +69544,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("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/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-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" ]
@@ -70072,25 +69578,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f16-qc8w-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/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-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" ]
@@ -70111,25 +69607,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qd8-f16-qc8w-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/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-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" ]
@@ -70153,15 +69639,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f16-qc8w-igemm_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/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-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" ]
@@ -70182,15 +69670,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qd8-f16-qc8w-igemm_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/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-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" ]
@@ -70214,20 +69704,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arm64") {
++  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-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-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" ]
@@ -70248,20 +69733,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arm64_standalone") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/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" ]
@@ -70285,14 +69765,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.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" ]
@@ -70313,14 +69796,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qu8-packw_arm64_standalone") {
++  source_set("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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.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" ]
@@ -70344,15 +69830,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_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-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-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" ]
@@ -70373,15 +69859,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_arm64_standalone") {
++  source_set("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-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-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" ]
@@ -70405,14 +69891,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-neondot-u32-acc2.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" ]
@@ -70433,14 +69920,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
++      "src/src/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" ]
@@ -70464,15 +69952,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-neon-u32-acc2.c",
-+    "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.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" ]
@@ -70493,15 +69981,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_arm64_standalone") {
++  source_set("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-rsum/gen/qs8-rsum-neon-u32-acc2.c",
-+    "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.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" ]
@@ -70525,17 +70013,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_arm64") {
++  source_set("qd8-f32-qb4w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u16.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u32.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "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" ]
@@ -70556,17 +70044,17 @@ Index: chromium-148.0.7778.96/third_party/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("qd8-f32-qb4w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u16.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u32.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "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" ]
@@ -70590,17 +70078,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_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-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/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" ]
@@ -70621,17 +70108,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_arm64_standalone") {
++  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/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" ]
@@ -70655,15 +70141,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_arm64") {
++  source_set("qd8-f32-qc2w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
-+    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -70684,15 +70169,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_arm64_standalone") {
++  source_set("qd8-f32-qc2w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
-+    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -70716,15 +70200,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_arm64") {
++  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-vlrelu/gen/qs8-vlrelu-neon-u32.c",
-+    "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.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" ]
@@ -70745,15 +70229,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_arm64_standalone") {
++  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/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" ]
@@ -70777,15 +70261,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_arm64") {
++  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-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-u16.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" ]
@@ -70806,15 +70290,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_arm64_standalone") {
++  source_set("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-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-u16.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" ]
@@ -70838,15 +70322,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_arm64") {
++  source_set("qd8-f32-qc4w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/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" ]
@@ -70867,15 +70353,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_arm64_standalone") {
++  source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/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" ]
@@ -70899,14 +70387,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_arm64") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.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" ]
@@ -70927,14 +70418,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_arm64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.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" ]
@@ -70958,14 +70452,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_arm64") {
++  source_set("qd8-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/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.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" ]
@@ -70986,14 +70483,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_arm64_standalone") {
++  source_set("qd8-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/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.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" ]
@@ -71017,14 +70517,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_arm64") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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" ]
@@ -71045,14 +70546,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_arm64_standalone") {
++  source_set("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-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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" ]
@@ -71076,19 +70578,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_arm64") {
++  source_set("qd8-f32-qc8w-gemm_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/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" ]
@@ -71109,19 +70612,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_arm64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-rndnu-neon-mul8.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-rndnu-neon-mul8.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/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" ]
@@ -71145,15 +70649,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_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/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
-+    "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.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" ]
@@ -71174,15 +70680,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_arm64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/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" ]
@@ -71206,7 +70714,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -71215,10 +70723,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +    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/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" ]
@@ -71239,7 +70745,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -71248,10 +70754,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +    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/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" ]
@@ -71275,20 +70779,83 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arm64") {
++  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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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_arch=armv8.2-a+i8mm+fp16_standalone") {
++    cflags = [
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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/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" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qd8-f32-qc8w-igemm_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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71309,20 +70876,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_arm64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
++      "src/src/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" ]
@@ -71346,19 +70915,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qp8-f32-qb4w-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/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" ]
@@ -71379,19 +70945,16 @@ Index: chromium-148.0.7778.96/third_party/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("qp8-f32-qb4w-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/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" ]
@@ -71415,20 +70978,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_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/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/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71449,20 +71006,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_arm64_standalone") {
++  source_set("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/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/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71486,16 +71037,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_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/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/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" ]
@@ -71516,16 +71067,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_arm64_standalone") {
++  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/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" ]
@@ -71549,15 +71100,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_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/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
-+    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71578,15 +71128,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_arm64_standalone") {
++  source_set("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/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
-+    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71610,17 +71159,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_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/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/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" ]
@@ -71641,17 +71188,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_arm64_standalone") {
++  source_set("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/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/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" ]
@@ -71675,17 +71220,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_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/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/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" ]
@@ -71706,17 +71250,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_arm64_standalone") {
++  source_set("qp8-f32-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/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" ]
@@ -71740,15 +71283,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_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/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
-+    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71769,15 +71311,79 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_arm64_standalone") {
++  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++    cflags = [
++      "-march=armv8.2-a+i8mm+fp16"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
++      "-march=armv8.2-a+sve+sve2"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/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/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
-+    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.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" ]
@@ -71801,15 +71407,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arm64") {
++  source_set("qs8-dwconv_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
-+    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-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" ]
@@ -71830,15 +71441,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_arm64_standalone") {
++  source_set("qs8-dwconv_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
-+    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-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" ]
@@ -71862,15 +71478,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_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-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-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71891,15 +71506,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_arm64_standalone") {
++  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71923,15 +71537,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_arm64") {
++  source_set("qs8-f32-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qs8-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" ]
@@ -71952,15 +71566,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_arm64_standalone") {
++  source_set("qs8-f32-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qs8-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" ]
@@ -71984,14 +71598,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_arm64") {
++  source_set("qs8-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.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" ]
@@ -72012,14 +71629,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_arm64_standalone") {
++  source_set("qs8-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.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" ]
@@ -72043,14 +71663,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_arm64") {
++  source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.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" ]
@@ -72071,14 +71692,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_arm64_standalone") {
++  source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.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" ]
@@ -72102,14 +71724,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_arm64") {
++  source_set("qs8-qc2w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.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" ]
@@ -72130,14 +71755,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_arm64_standalone") {
++  source_set("qs8-qc2w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.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" ]
@@ -72161,16 +71789,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("reference_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/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "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" ]
@@ -72191,16 +71820,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("reference_arm64_standalone") {
++  source_set("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/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "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" ]
@@ -72224,16 +71854,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_arm64") {
++  source_set("qs8-qc4w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/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" ]
@@ -72254,16 +71883,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_arm64_standalone") {
++  source_set("qs8-qc4w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/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" ]
@@ -72287,15 +71915,27 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_arm64") {
++  source_set("qs8-qc8w-dwconv_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-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" ]
@@ -72316,15 +71956,27 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_arm64_standalone") {
++  source_set("qs8-qc8w-dwconv_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-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" ]
@@ -72348,17 +72000,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_arm64") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -72379,17 +72031,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_arm64_standalone") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -72413,19 +72065,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_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/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-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" ]
@@ -72446,19 +72104,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_arm64_standalone") {
++  source_set("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/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-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" ]
@@ -72482,15 +72146,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_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/s8-vclamp/s8-vclamp-neon-u64.c",
-+    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-neoni8mm.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c8-minmax-fp32-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72511,15 +72175,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_arm64_standalone") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -72543,42 +72207,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("subgraph_arm64") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -72599,42 +72241,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_arm64_standalone") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -72658,22 +72278,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("tables_arm64") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -72694,22 +72309,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_arm64_standalone") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -72733,77 +72343,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_arm64_standalone") {
++  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/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" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
++  asmflags = cflags
 +
-+if (build_with_chromium) {
-+  source_set("u8-lut32norm_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-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" ]
@@ -72824,14 +72382,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_arm64_standalone") {
++  source_set("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/u8-lut32norm/u8-lut32norm-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" ]
@@ -72855,15 +72424,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_arm64") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -72884,15 +72453,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_arm64_standalone") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -72916,17 +72485,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_arm64") {
++  source_set("qs8-qc8w-igemm_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-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" ]
@@ -72947,17 +72519,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_arm64_standalone") {
++  source_set("qs8-qc8w-igemm_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-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" ]
@@ -72981,19 +72556,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_arm64") {
++  source_set("qs8-qu8-packw_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/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73014,19 +72584,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_arm64_standalone") {
++  source_set("qs8-qu8-packw_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/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73050,15 +72615,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_arm64") {
++  source_set("qs8-rdsum_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/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" ]
@@ -73079,15 +72644,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_arm64_standalone") {
++  source_set("qs8-rdsum_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/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" ]
@@ -73111,17 +72676,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("qs8-rsum_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73142,17 +72704,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("qs8-rsum_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73176,15 +72735,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-packw_arm64") {
++  source_set("qs8-rsum_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/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" ]
@@ -73205,15 +72764,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_arm64_standalone") {
++  source_set("qs8-rsum_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/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" ]
@@ -73237,15 +72796,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_arm64") {
++  source_set("qs8-vadd_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
-+    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
++      "src/src/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" ]
@@ -73266,15 +72827,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_arm64_standalone") {
++  source_set("qs8-vadd_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
-+    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
++      "src/src/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" ]
@@ -73298,15 +72861,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_arm64") {
++  source_set("qs8-vaddc_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/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" ]
@@ -73327,15 +72892,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-x32-packw_arm64_standalone") {
++  source_set("qs8-vaddc_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/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" ]
@@ -73359,16 +72926,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_arm64") {
++  source_set("qs8-vcvt_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/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
++    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73389,16 +72955,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_arm64_standalone") {
++  source_set("qs8-vcvt_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/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
++    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73422,17 +72987,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("qs8-vlrelu_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/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" ]
@@ -73453,17 +73016,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("qs8-vlrelu_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/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" ]
@@ -73487,24 +73048,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_arm64") {
++  source_set("qs8-vmul_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/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" ]
@@ -73525,24 +73077,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_arm64_standalone") {
++  source_set("qs8-vmul_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/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" ]
@@ -73566,16 +73109,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_arm64") {
++  source_set("qs8-vmulc_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/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" ]
@@ -73596,16 +73138,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_arm64_standalone") {
++  source_set("qs8-vmulc_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/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" ]
@@ -73629,15 +73170,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_arm64") {
++  source_set("qs8-vprelu_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/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73658,15 +73198,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_arm64_standalone") {
++  source_set("qs8-vprelu_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/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73690,16 +73229,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_arm64") {
++  source_set("qs8-vpreluc_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/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73720,16 +73257,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_arm64_standalone") {
++  source_set("qs8-vpreluc_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/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73753,15 +73288,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_arm64") {
++  source_set("qs8-vrpreluc_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/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73782,15 +73316,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_arm64_standalone") {
++  source_set("qs8-vrpreluc_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/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73804,299 +73337,101 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vadd_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vadd_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("qu8-dwconv_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-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" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vadd_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("qu8-dwconv_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-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-rndnu-neon-mul8.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-rndnu-neon-mul8.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vaddc_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("x8-packq_arm64") {
++  source_set("qu8-f32-vcvt_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-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
++    "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vaddc_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -74105,734 +73440,236 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_arm64_standalone") {
++  source_set("qu8-f32-vcvt_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-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
++    "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vaddc_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vaddc_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("x8-packw_arm64") {
++  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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("qs8-vaddc_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vaddc_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vaddc_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packw_arm64_standalone") {
++  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vaddc_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("x8-transposec_arm64") {
++  source_set("qu8-gemm_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-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_arm64_standalone") {
++  source_set("qu8-gemm_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-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vcvt_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vcvt_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("xx-copy_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/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vcvt_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_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/xx-copy/xx-copy-scalar-memcpy.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++      "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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vcvt_ssse3-no-sse4.1_standalone") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -74844,255 +73681,99 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("xx-fill_arm64") {
++  source_set("qu8-igemm_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/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" ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vcvt_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_arm64_standalone") {
++  source_set("qu8-igemm_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/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vlrelu_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("xx-pad_arm64") {
++  source_set("qu8-rdsum_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/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vlrelu_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -75101,772 +73782,3937 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vlrelu_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_arm64_standalone") {
++  source_set("qu8-rdsum_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/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vlrelu_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vlrelu_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("xx-transposev_arm64") {
++  source_set("qu8-rsum_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
++    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vlrelu_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vlrelu_ssse3-no-sse4.1_standalone") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vlrelu_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-transposev_arm64_standalone") {
++  source_set("qu8-rsum_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
++    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-vadd_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-vadd_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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-vaddc_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-vaddc_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
++    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-vcvt_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
++    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-vlrelu_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vlrelu_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
++    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-vmul_arm64") {
++    cflags = [
++  
++    ]
++  
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vmul_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-vmulc_arm64") {
++    cflags = [
++  
++    ]
++  
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vmulc_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-vprelu_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vprelu_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-vpreluc_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vpreluc_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-vrpreluc_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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vrpreluc_arm64_standalone") {
++    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:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("reference_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//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("reference_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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-ibilinear_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("s8-ibilinear_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("s8-maxpool_arm64") {
++    cflags = [
++  
++    ]
++  
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("s8-maxpool_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("s8-rdminmax_arm64") {
++    cflags = [
++  
++    ]
++  
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("s8-rdminmax_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("s8-rminmax_arm64") {
++    cflags = [
++  
++    ]
++  
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("s8-rminmax_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("s8-vclamp_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
++    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("s8-vclamp_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("subgraph_arm64") {
++    cflags = [
++  
++    ]
++  
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("subgraph_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("tables_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("tables_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("u8-ibilinear_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-ibilinear_arm64_standalone") {
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("u8-lut32norm_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-lut32norm_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("u8-maxpool_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-maxpool_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("u8-rdminmax_arm64") {
++    cflags = [
++  
++    ]
++  
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-rdminmax_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("u8-rminmax_arm64") {
++    cflags = [
++  
++    ]
++  
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-rminmax_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("u8-vclamp_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
++    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    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-vclamp_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
++    cflags = [
++      "-march=armv8.2-a+sve+sve2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++    cflags = [
++      "-march=armv8.2-a+sve+sve2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x16-packw_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
++    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x16-packw_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x16-transposec_arm64") {
++    cflags = [
++  
++    ]
++  
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
++    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x16-x32-packw_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x16-x32-packw_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x24-transposec_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("x24-transposec_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
++    cflags = [
++      "-march=armv8.2-a+sve+sve2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-pack-lh/x32-packlh-igemm-neonsme.c",
++    "src/src/x32-pack-lh/x32-packlh-igemm-neonsme2.c",
++    "src/src/x32-pack-lh/x32-packlh-neonsme.c",
++    "src/src/x32-pack-lh/x32-packlh-neonsme2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++    cflags = [
++      "-march=armv8.2-a+sve+sve2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-pack-lh/x32-packlh-igemm-neonsme.c",
++    "src/src/x32-pack-lh/x32-packlh-igemm-neonsme2.c",
++    "src/src/x32-pack-lh/x32-packlh-neonsme.c",
++    "src/src/x32-pack-lh/x32-packlh-neonsme2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x32-packw_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x32-packw_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x32-transposec_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x32-transposec_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x32-unpool_arm64") {
++    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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vlrelu_x64_standalone") {
--      cflags = []
++
++if (build_with_chromium) {
++  source_set("f16-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" ]
++  }
 +}
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
-+if (current_cpu == "riscv64") {
++
++# 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("configs_riscv64") {
++  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/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-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
++    }
++  }
++}
++
++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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmul_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
--
--      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") {
++  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/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-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c"
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vmul_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmul_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
++    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" ]
--    }
--  }
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vmul_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmul_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("enums_riscv64") {
++  source_set("f16-qs8-vcvt_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"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vmul_x64_standalone") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("enums_riscv64_standalone") {
++  source_set("f16-qs8-vcvt_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"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/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" ]
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vmulc_sse2-no-sse3") {
@@ -75891,14 +77737,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -75930,22 +77779,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      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"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vmulc_sse4.1-no-sse4.2") {
@@ -75970,20 +77808,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("f16-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" ]
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -76016,6 +77859,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -76025,7 +77875,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -76033,10 +77883,7 @@ Index: chromium-148.0.7778.96/third_party/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-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c"
 +    ]
  
 -      sources = [
@@ -76104,7 +77951,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -76112,7 +77959,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -76195,7 +78043,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -76203,7 +78051,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
 +    ]
  
 -      sources = [
@@ -76271,14 +78120,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_riscv64") {
++  source_set("f16-rdminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -76361,187 +78211,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_riscv64_standalone") {
++  source_set("f16-rdminmax_riscv64_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/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",
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.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-vpreluc_x64_standalone") {
--      cflags = []
--
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c",
 -      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("f16-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"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vrpreluc_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vrpreluc_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vrpreluc_x64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-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"
-+    ]
- 
--      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" ]
@@ -76575,10 +78259,35 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vrpreluc_x64_standalone") {
+-    source_set("qs8-vpreluc_x64_standalone") {
 -      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -76586,7 +78295,154 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c"
++      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
++    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vrpreluc_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vrpreluc_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vrpreluc_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vrpreluc_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f16-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"
 +    ]
  
 -      sources = [
@@ -76694,15 +78550,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-rminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c"
++      "src/src/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) {
@@ -76816,7 +78673,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -76824,7 +78681,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
++      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -76910,7 +78767,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -76918,7 +78775,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
++      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -77036,15 +78893,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vapproxgelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -77093,15 +78949,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vapproxgelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -77236,7 +79091,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -77244,8 +79099,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
-+    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c"
++      "src/src/f16-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" ]
@@ -77330,7 +79202,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -77338,8 +79210,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
-+    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c"
++      "src/src/f16-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" ]
@@ -77460,7 +79349,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -77468,8 +79357,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
-+    "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -77550,7 +79438,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -77558,8 +79446,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
-+    "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
 +    ]
  
 -      sources = [
@@ -77627,14 +79514,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_riscv64") {
++  source_set("f16-vcos_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -77743,14 +79630,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_riscv64_standalone") {
++  source_set("f16-vcos_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -77881,14 +79768,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_riscv64") {
++  source_set("f16-vexp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -77992,14 +79879,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qu8-vcvt_riscv64_standalone") {
++  source_set("f16-vexp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -78066,16 +79953,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vgelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78112,16 +79997,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vgelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -78257,15 +80140,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_riscv64") {
++  source_set("f16-vhswish_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-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -78352,15 +80235,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_riscv64_standalone") {
++  source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -78484,7 +80367,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -78492,9 +80375,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -78577,7 +80458,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -78585,9 +80466,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
 +    ]
  
 -      sources = [
@@ -78657,16 +80536,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_riscv64") {
++  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -78747,16 +80625,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_riscv64_standalone") {
++  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.c"
 +    ]
  
 -      sources = [
@@ -78799,7 +80676,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-rdsum_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -78807,7 +80684,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.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 = [
@@ -78911,7 +80791,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -78919,7 +80799,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c"
++      "src/src/f16-vrnd/gen/f16-vrndd-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndne-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndu-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndz-rvvfp16arith-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -79019,14 +80902,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_riscv64") {
++  source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -79102,14 +80986,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_riscv64_standalone") {
++  source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -79228,33 +81113,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsin_riscv64") {
 +    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"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -79371,33 +81237,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsin_riscv64_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"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -79518,7 +81365,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -79526,7 +81373,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79563,7 +81410,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -79571,7 +81418,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
 +    ]
  
 -      sources = [
@@ -79704,14 +81551,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vcos_riscv64") {
++  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-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" ]
@@ -79796,14 +81646,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_riscv64_standalone") {
++  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-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" ]
@@ -79924,14 +81777,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vexp_riscv64") {
++  source_set("f32-argmaxpool_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-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -80012,14 +81866,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_riscv64_standalone") {
++  source_set("f32-argmaxpool_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-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -      sources = [
@@ -80089,14 +81944,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_riscv64") {
++  source_set("f32-argmaxpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -80202,14 +82057,14 @@ Index: chromium-148.0.7778.96/third_party/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-argmaxpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -80325,14 +82180,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_riscv64") {
++  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -80433,14 +82289,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_riscv64_standalone") {
++  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -80505,17 +82362,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-avgpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vneg-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vsqr-rvvfp16arith-u8v.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80552,17 +82406,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f32-avgpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vneg-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vsqr-rvvfp16arith-u8v.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -80694,15 +82545,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-bf16-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -80781,15 +82631,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-bf16-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -80904,14 +82753,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_riscv64") {
++  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -80992,14 +82842,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_riscv64_standalone") {
++  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -      sources = [
@@ -81042,14 +82893,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vlrelu_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_riscv64") {
++  source_set("f32-conv-hwc2chw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -      sources = [
@@ -81155,14 +83006,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_riscv64_standalone") {
++  source_set("f32-conv-hwc2chw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -81265,7 +83116,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -81273,7 +83124,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -81331,7 +83183,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -81339,7 +83191,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
 +    ]
  
 -      sources = [
@@ -81382,14 +83235,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vmul_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_riscv64") {
++  source_set("f32-dwconv2d-chw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-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 = [
@@ -81495,14 +83355,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_riscv64_standalone") {
++  source_set("f32-dwconv2d-chw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-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) {
@@ -81605,7 +83472,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -81613,8 +83480,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++      "src/src/f32-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" ]
@@ -81672,7 +83545,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -81680,8 +83553,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++      "src/src/f32-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 = [
@@ -81749,21 +83628,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_riscv64") {
++  source_set("f32-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "src/src/f32-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) {
@@ -81846,21 +83727,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_riscv64_standalone") {
++  source_set("f32-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "src/src/f32-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 = [
@@ -81928,22 +83811,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_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-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-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -82026,22 +83902,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
 +    ]
  
 -      sources = [
@@ -82109,23 +83978,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_riscv64") {
++  source_set("f32-f16-vcvt_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-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -82218,23 +84078,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_riscv64_standalone") {
++  source_set("f32-f16-vcvt_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-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      deps = [
@@ -82303,15 +84154,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/reference/unary-elementwise.cc",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
++      "src/src/f32-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" ]
@@ -82348,15 +84200,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -82485,14 +84338,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_riscv64") {
++  source_set("f32-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-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" ]
@@ -82550,14 +84408,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_riscv64_standalone") {
++  source_set("f32-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-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 = [
@@ -82625,16 +84488,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-ibilinear-chw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -82715,16 +84576,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-ibilinear-chw_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      sources = [
@@ -82792,21 +84651,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-gemm_riscv64") {
++  source_set("f32-ibilinear_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -82889,21 +84741,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_riscv64_standalone") {
++  source_set("f32-ibilinear_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -82973,14 +84818,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_riscv64") {
++  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -83065,14 +84912,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_riscv64_standalone") {
++  source_set("f32-igemm_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-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -83144,14 +84993,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_riscv64") {
++  source_set("f32-igemm_riscv64") {
 +    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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -83260,14 +85114,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear_riscv64_standalone") {
++  source_set("f32-igemm_riscv64_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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -83388,7 +85247,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -83396,8 +85255,7 @@ Index: chromium-148.0.7778.96/third_party/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-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -83478,7 +85336,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -83486,8 +85344,7 @@ Index: chromium-148.0.7778.96/third_party/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-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -83555,21 +85412,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-igemm_riscv64") {
++  source_set("f32-maxpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -83643,21 +85493,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_riscv64_standalone") {
++  source_set("f32-maxpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -83765,15 +85608,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("tables_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qc4w-gemm_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-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -83883,15 +85726,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-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) {
@@ -83991,14 +85834,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_riscv64") {
++  source_set("f32-qc8w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -84052,14 +85896,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_riscv64_standalone") {
++  source_set("f32-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -84127,15 +85972,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_riscv64") {
++  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -84216,15 +86061,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc4w-gemm_riscv64_standalone") {
++  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -84292,15 +86137,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_riscv64") {
++  source_set("f32-qs8-vcvt_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-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) {
@@ -84383,15 +86228,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_riscv64_standalone") {
++  source_set("f32-qs8-vcvt_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-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      sources = [
@@ -84461,7 +86306,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -84469,7 +86314,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -84554,7 +86399,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -84562,7 +86407,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -84607,15 +86452,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("u8-rminmax_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_riscv64") {
++  source_set("f32-qu8-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"
++      "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 = [
@@ -84721,15 +86566,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_riscv64_standalone") {
++  source_set("f32-qu8-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"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -84844,7 +86689,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -84852,7 +86697,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -84910,7 +86755,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -84918,7 +86763,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      sources = [
@@ -84961,15 +86806,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("u8-vclamp_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_riscv64") {
++  source_set("f32-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      sources = [
@@ -85073,15 +86917,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_riscv64_standalone") {
++  source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -85186,7 +87029,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -85194,7 +87037,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -85252,7 +87096,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -85260,7 +87104,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -85303,14 +87148,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x16-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_riscv64") {
++  source_set("f32-rdminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -85367,14 +87213,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
++  source_set("f32-rdminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      deps = [
@@ -85457,7 +87304,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -85465,8 +87312,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -85524,7 +87370,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -85532,8 +87378,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -85576,15 +87421,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x24-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_riscv64") {
++  source_set("f32-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -85698,196 +87542,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_riscv64_standalone") {
-+    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("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",
-+    ]
- 
--      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",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && 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-packw_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
-+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"
-+    ]
- 
--      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",
--        "//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("x32-packw_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_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-packw_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("x32-packw_x64") {
--      cflags = []
+-    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" ]
@@ -85902,6 +87569,175 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      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",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && 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-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"
++    ]
+ 
+-      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",
+-        "//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("x32-packw_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_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-packw_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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_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"
++    ]
+ 
+-  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" ]
+ 
+-      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",
@@ -85921,6 +87757,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -85935,14 +87778,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_riscv64") {
++  source_set("f32-rdsum_riscv64") {
 +    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 = [
@@ -86053,14 +87896,14 @@ Index: chromium-148.0.7778.96/third_party/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-rdsum_riscv64_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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -86148,7 +87991,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86156,7 +87999,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-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" ]
@@ -86193,7 +88038,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86201,7 +88046,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-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 = [
@@ -86313,14 +88160,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/x32-unpool/x32-unpool-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_riscv64") {
++  source_set("f32-rminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86357,14 +88206,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_riscv64_standalone") {
++  source_set("f32-rminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -86495,7 +88346,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86503,9 +88354,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -86563,7 +88412,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86571,9 +88420,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -86641,16 +88488,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_riscv64") {
++  source_set("f32-rsum2_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -86756,16 +88601,14 @@ Index: chromium-148.0.7778.96/third_party/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-rsum2_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -86892,7 +88735,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86900,7 +88743,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c"
++      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -86995,7 +88838,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87003,7 +88846,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c"
++      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -87046,14 +88889,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x8-lut_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_riscv64") {
++  source_set("f32-rsum_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -87109,14 +88952,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_riscv64_standalone") {
++  source_set("f32-rsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      deps = [
@@ -87178,7 +89021,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x8-packw_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87186,13 +89029,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
++      "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
++    "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
++    "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c"
 +    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -87213,15 +89053,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -87232,7 +89077,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87240,7 +89085,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
++      "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
++    "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
++    "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -87372,14 +89219,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum_riscv64") {
++  source_set("f32-spmm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.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" ]
@@ -87437,14 +89286,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_riscv64_standalone") {
++  source_set("f32-spmm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -87487,17 +89338,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x8-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vapproxgelu_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-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -87553,17 +89401,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vapproxgelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      deps = [
@@ -87645,16 +89490,33 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-spmm_riscv64") {
++  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-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" ]
@@ -87712,16 +89574,33 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_riscv64_standalone") {
++  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-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 = [
@@ -87789,14 +89668,32 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_riscv64") {
++  source_set("f32-vbinary_riscv64") {
 +    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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -87822,32 +89719,248 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/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("xx-pad_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vbinary_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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "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",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && 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-pad_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "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" ]
+-      }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("xx-transposev_x64") {
+-      cflags = []
++# 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-vclamp/gen/f32-vclamp-rvv-u8v.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",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-pad_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-    source_set("xx-transposev_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-vclamp_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-pad/xx-pad-p16-sse2-u16.c",
+-        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -87868,28 +89981,42 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
-+}
+ }
  
+-if (current_cpu == "arm64") {
 -  if (build_with_chromium) {
--    source_set("xx-pad_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-vapproxgelu_riscv64_standalone") {
++  source_set("f32-vclamp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-pad/xx-pad-p4-scalar-u16.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" ]
@@ -87924,10 +90051,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-pad_x64_standalone") {
+-    source_set("bf16-f32-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87935,30 +90062,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-pad/xx-pad-p4-scalar-u16.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" ]
@@ -87986,7 +90096,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("xx-transposev_x64") {
+-    source_set("bf16-qs8-vcvt_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -87997,7 +90107,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -88009,7 +90119,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88017,25 +90127,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -88061,13 +90153,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-transposev_x64_standalone") {
+-    source_set("bf16-qs8-vcvt_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88091,39 +90183,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      assert_no_deps = [ "//base" ]
      }
    }
- }
++}
  
--if (current_cpu == "arm64") {
 -  if (build_with_chromium) {
--    source_set("configs_arm64") {
+-    source_set("bf16-rminmax_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/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" ]
@@ -88138,32 +90211,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_riscv64") {
++  source_set("f32-vcmul_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -88176,7 +90231,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("configs_arm64_standalone") {
+-    source_set("bf16-rminmax_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -88187,30 +90242,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/configs/argmaxpool-config.c",
--        "src/src/configs/avgpool-config.c",
--        "src/src/configs/binary-elementwise-config.c",
--        "src/src/configs/cmul-config.c",
--        "src/src/configs/conv-hwc2chw-config.c",
--        "src/src/configs/dwconv-config.c",
--        "src/src/configs/dwconv2d-chw-config.c",
--        "src/src/configs/gemm-config.c",
--        "src/src/configs/hardware-config.c",
--        "src/src/configs/ibilinear-chw-config.c",
--        "src/src/configs/ibilinear-config.c",
--        "src/src/configs/lut32norm-config.c",
--        "src/src/configs/maxpool-config.c",
--        "src/src/configs/pack-lh-config.c",
--        "src/src/configs/raddstoreexpminusmax-config.c",
--        "src/src/configs/reduce-config.c",
--        "src/src/configs/spmm-config.c",
--        "src/src/configs/transpose-config.c",
--        "src/src/configs/unary-elementwise-config.c",
--        "src/src/configs/unpool-config.c",
--        "src/src/configs/vmulcaddc-config.c",
--        "src/src/configs/x8-lut-config.c",
--        "src/src/configs/xx-fill-config.c",
--        "src/src/configs/xx-pad-config.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmax-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" ]
@@ -88236,45 +90273,46 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("enums_arm64") {
+-    source_set("configs_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_riscv64_standalone") {
++  source_set("f32-vcmul_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/enums/allocation-type.c",
--        "src/src/enums/datatype-strings.c",
--        "src/src/enums/microkernel-type.c",
--        "src/src/enums/node-type.c",
--        "src/src/enums/operator-type.c",
+-        "src/src/configs/argmaxpool-config.c",
+-        "src/src/configs/avgpool-config.c",
+-        "src/src/configs/binary-elementwise-config.c",
+-        "src/src/configs/cmul-config.c",
+-        "src/src/configs/conv-hwc2chw-config.c",
+-        "src/src/configs/dwconv-config.c",
+-        "src/src/configs/dwconv2d-chw-config.c",
+-        "src/src/configs/gemm-config.c",
+-        "src/src/configs/hardware-config.c",
+-        "src/src/configs/ibilinear-chw-config.c",
+-        "src/src/configs/ibilinear-config.c",
+-        "src/src/configs/lut32norm-config.c",
+-        "src/src/configs/maxpool-config.c",
+-        "src/src/configs/pack-lh-config.c",
+-        "src/src/configs/raddstoreexpminusmax-config.c",
+-        "src/src/configs/reduce-config.c",
+-        "src/src/configs/spmm-config.c",
+-        "src/src/configs/transpose-config.c",
+-        "src/src/configs/unary-elementwise-config.c",
+-        "src/src/configs/unpool-config.c",
+-        "src/src/configs/vmulcaddc-config.c",
+-        "src/src/configs/x8-lut-config.c",
+-        "src/src/configs/xx-fill-config.c",
+-        "src/src/configs/xx-pad-config.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88305,17 +90343,36 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("enums_arm64_standalone") {
+-    source_set("configs_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_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",
+-        "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" ]
@@ -88342,12 +90399,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-avgpool_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("enums_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.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" ]
@@ -88362,7 +90423,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88370,7 +90431,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -88383,8 +90446,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-avgpool_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("enums_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88394,7 +90457,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.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" ]
@@ -88420,11 +90487,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
+-    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-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88432,12 +90499,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.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" ]
@@ -88472,12 +90541,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-avgpool_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
--
++if (build_with_chromium) {
++  source_set("f32-vcopysign_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c",
+-        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88499,79 +90580,77 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-vclamp_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("f16-dwconv2d-chw_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-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-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_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-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"
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88591,30 +90670,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("f16-dwconv_arch=armv8.2-a+fp16") {
+-    source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88628,21 +90699,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-dwconv_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-vcos_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88650,16 +90708,34 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88680,39 +90756,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("f16-f32-vcvt_arm64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
--      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("f16-dwconv_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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vcos_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88720,9 +90773,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
 +    ]
  
+-      sources = [
+-        "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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -88746,15 +90813,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32-vcvt_arm64_standalone") {
--      cflags = []
+-    source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88781,12 +90850,14 @@ Index: chromium-148.0.7778.96/third_party/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-f32-vcvt_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.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" ]
@@ -88801,14 +90872,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_riscv64") {
++  source_set("f32-vcos_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -88821,8 +90892,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-f32-vcvt_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88832,7 +90903,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.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" ]
@@ -88858,23 +90931,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
+-    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-vcmul_riscv64_standalone") {
++  source_set("f32-vcos_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
+-        "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" ]
@@ -88909,24 +90982,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_riscv64") {
++  source_set("f32-velu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88954,7 +91025,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
+-    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -88965,7 +91036,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -88977,16 +91048,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_riscv64_standalone") {
++  source_set("f32-velu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      deps = [
@@ -89012,13 +91081,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-f32acc-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/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89045,39 +91114,49 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
+-    source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c",
+-        "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",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcos_riscv64") {
++  source_set("f32-vexp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vexp/gen/f32-vexp-rvv-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" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//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",
@@ -89085,28 +91164,89 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 -    }
 +    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=armv8.2-a+fp16_standalone") {
+-  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-vcos_riscv64_standalone") {
++  source_set("f32-vexp_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-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" ]
++    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-f32acc-rsum_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c",
@@ -89131,20 +91271,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("f32-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" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -89165,12 +91309,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -89178,17 +91326,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-gemm_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+if (build_with_chromium) {
-+  source_set("f32-velu_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c",
@@ -89216,26 +91354,34 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
++# 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 (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" ]
  
--  if (build_with_chromium) {
--    source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-      asmflags = cflags
 +    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/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
@@ -89257,40 +91403,43 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_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("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") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_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-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-      asmflags = 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/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
@@ -89318,60 +91467,75 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-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-vgelu_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-vexp_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-ibilinear-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",
++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 = [
@@ -89397,43 +91561,45 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-ibilinear_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("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"
 +    ]
  
 -      deps = [
@@ -89442,20 +91608,27 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-ibilinear_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c",
@@ -89478,27 +91651,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("f32-vgelu_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-igemm_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+    configs -= [ "//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/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c",
@@ -89518,24 +91680,36 @@ Index: chromium-148.0.7778.96/third_party/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-vhswish_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vhswish/gen/f32-vhswish-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("f16-igemm_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c",
@@ -89562,22 +91736,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_riscv64_standalone") {
++  source_set("f32-vhswish_riscv64_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"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -89626,7 +91803,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vlog_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89634,22 +91811,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "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" ]
  
--      asmflags = cflags
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
@@ -89678,6 +91848,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -89687,7 +91864,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vlog_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89695,7 +91872,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -89738,14 +91915,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f16-maxpool_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_riscv64") {
++  source_set("f32-vlog_riscv64") {
 +    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 = [
@@ -89801,14 +91978,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_riscv64_standalone") {
++  source_set("f32-vlog_riscv64_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"
 +    ]
  
 -      deps = [
@@ -89887,14 +92064,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlog_riscv64") {
++  source_set("f32-vlrelu_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-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89948,14 +92126,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_riscv64_standalone") {
++  source_set("f32-vlrelu_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-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -89998,15 +92177,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f16-qu8-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -90062,15 +92240,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vlrelu_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-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -90150,14 +92327,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_riscv64") {
++  source_set("f32-vmulcaddc_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-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90212,14 +92390,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_riscv64_standalone") {
++  source_set("f32-vmulcaddc_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-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
 +    ]
  
 -      sources = [
@@ -91001,14 +93180,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_riscv64") {
++  source_set("f32-vsigmoid_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -91062,14 +93242,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_riscv64_standalone") {
++  source_set("f32-vsigmoid_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-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -91112,14 +93293,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vcos_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vsin_riscv64") {
++  source_set("f32-vsigmoid_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      sources = [
@@ -91175,14 +93356,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_riscv64_standalone") {
++  source_set("f32-vsigmoid_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      deps = [
@@ -91261,7 +93442,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsin_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91269,7 +93450,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
++      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -91323,7 +93504,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vsin_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91331,7 +93512,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
++      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -91374,14 +93555,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vexp_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_riscv64") {
++  source_set("f32-vsin_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -91407,50 +93588,60 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-vexp_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("f16-vexp_arm64") {
--      cflags = []
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_riscv64_standalone") {
++  source_set("f32-vsin_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.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",
@@ -91458,35 +93649,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vexp_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vtanh_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -91510,79 +93677,34 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vgelu_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-vtanh_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/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" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vunary_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91590,9 +93712,26 @@ Index: chromium-148.0.7778.96/third_party/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/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("f16-vgelu_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 = [
@@ -91618,18 +93757,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -91639,7 +93766,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91647,9 +93774,7 @@ Index: chromium-148.0.7778.96/third_party/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/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
 +    ]
  
 -      sources = [
@@ -91692,16 +93817,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vgelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vunary_riscv64") {
++  source_set("f32-vsqrt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -91748,16 +93871,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_riscv64_standalone") {
++  source_set("f32-vsqrt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -91800,36 +93921,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vhswish_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("operators_riscv64") {
++  source_set("f32-vtanh_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/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -91885,36 +93985,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("operators_riscv64_standalone") {
++  source_set("f32-vtanh_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/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -91981,14 +94060,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_riscv64") {
++  source_set("f32-vtanh_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92025,14 +94104,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_riscv64_standalone") {
++  source_set("f32-vtanh_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      sources = [
@@ -92107,16 +94186,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vrnd_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-vunary_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/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 = [
@@ -92145,52 +94225,63 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f32-vunary_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/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-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.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",
@@ -92198,37 +94289,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
-+    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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -92252,91 +94317,63 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vsigmoid_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-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/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" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("f32-vunary_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"
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qd8-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",
 +    ]
  
 -      sources = [
@@ -92363,18 +94400,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -92384,16 +94409,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f32-vunary_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/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 = [
@@ -92436,15 +94461,36 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_riscv64") {
++  source_set("operators_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/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 = [
@@ -92470,51 +94516,82 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-vsin_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("f16-vsin_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("qd8-f32-qb4w-gemm_riscv64_standalone") {
++  source_set("operators_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/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-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -92522,39 +94599,95 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vsin_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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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-vsin_arm64_standalone") {
--      cflags = []
+-  if (build_with_chromium) {
+-    source_set("f16-vsqrt_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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_riscv64") {
++  source_set("qd8-f16-qc2w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-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("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-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92575,41 +94708,29 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vsqrt_arch=armv8.2-a+fp16") {
+-    source_set("f16-vtanh_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_riscv64_standalone") {
++  source_set("qd8-f16-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"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -92644,25 +94765,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-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-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92690,7 +94811,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vtanh_arch=armv8.2-a+fp16") {
+-    source_set("f16-vunary_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -92701,8 +94822,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
--        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
+-        "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
+-        "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
+-        "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -92714,16 +94836,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-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 = [
@@ -92749,14 +94871,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
--        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
+-        "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
+-        "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
+-        "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92783,14 +94906,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vunary_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-argmaxpool_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92805,15 +94927,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_riscv64") {
++  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x2v-minmax-rvvfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-7x2v-minmax-rvvfp16arith.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -92826,8 +94949,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-argmaxpool_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -92837,9 +94960,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92865,25 +94987,26 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-argmaxpool_arm64") {
+-    source_set("f32-avgpool_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_riscv64_standalone") {
++  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -92918,25 +95041,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-argmaxpool_arm64_standalone") {
+-    source_set("f32-avgpool_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-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/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92964,8 +95087,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-avgpool_arm64") {
--      cflags = []
+-    source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16") {
+-      cflags = [ "-march=armv8.2-a+bf16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -92975,8 +95098,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      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-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -92988,16 +95110,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-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 = [
@@ -93023,14 +95145,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-avgpool_arm64_standalone") {
--      cflags = []
+-    source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16_standalone") {
+-      cflags = [ "-march=armv8.2-a+bf16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -93057,14 +95178,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-conv-hwc2chw_arm64") {
+-    source_set("f32-bf16-vcvt_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
+-        "src/src/f32-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" ]
@@ -93079,16 +95199,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_riscv64") {
++  source_set("qd8-f32-qb4w-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/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" ]
@@ -93101,7 +95220,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-conv-hwc2chw_arm64_standalone") {
+-    source_set("f32-bf16-vcvt_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -93112,6 +95231,102 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      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" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-conv-hwc2chw_arm64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("qd8-f32-qc2w-gemm_riscv64") {
++    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-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",
@@ -93135,6 +95350,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -93144,16 +95371,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_riscv64_standalone") {
++  source_set("qd8-f32-qc2w-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/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -93255,7 +95480,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93263,8 +95488,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
++      "src/src/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"
 +    ]
  
 -      asmflags = cflags
@@ -93300,7 +95525,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93308,8 +95533,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
++      "src/src/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" ]
@@ -93400,16 +95625,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_riscv64") {
++  source_set("qd8-f32-qc4w-gemm_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/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -93480,16 +95704,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_riscv64_standalone") {
++  source_set("qd8-f32-qc4w-gemm_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/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 = [
@@ -93534,7 +95757,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-f16-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93542,8 +95765,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qd8-f32-qc8w-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 = [
@@ -93630,7 +95853,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93638,8 +95861,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qd8-f32-qc8w-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" ]
@@ -93720,7 +95943,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "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-relu-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",
@@ -93731,7 +95953,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-neon-lane-ld128.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x8s4-minmax-neonfma.c",
@@ -93751,17 +95972,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_riscv64") {
++  source_set("qd8-f32-qc8w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -93787,7 +96007,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "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-relu-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",
@@ -93798,7 +96017,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-neon-lane-ld128.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x8s4-minmax-neonfma.c",
@@ -93833,17 +96051,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/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 = [
@@ -93888,7 +96105,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-ibilinear-chw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93896,7 +96113,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.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 = [
@@ -93956,7 +96174,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93964,7 +96182,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      deps = [
@@ -94028,14 +96247,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_riscv64") {
++  source_set("qd8-f32-qc8w-igemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.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"
 +    ]
  
 -      asmflags = cflags
@@ -94098,14 +96319,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.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 = [
@@ -94168,7 +96391,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "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-relu-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",
@@ -94179,7 +96401,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-neon-lane-ld128.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x8s4-minmax-neonfma.c",
@@ -94212,24 +96433,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-packw_riscv64") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-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-relu-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",
@@ -94240,7 +96459,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-neon-lane-ld128.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x8s4-minmax-neonfma.c",
@@ -94297,17 +96515,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_riscv64_standalone") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -94393,17 +96610,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_riscv64") {
++  source_set("qs8-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qs8-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" ]
@@ -94465,17 +96682,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_riscv64_standalone") {
++  source_set("qs8-dwconv_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-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 = [
@@ -94520,23 +96737,30 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_riscv64") {
++  source_set("qs8-f32-vcvt_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-f32-vcvt/gen/qs8-f32-vcvt-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" ]
  
+-      asmflags = cflags
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S",
@@ -94562,13 +96786,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -94578,15 +96795,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_riscv64_standalone") {
++  source_set("qs8-f32-vcvt_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-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -94688,17 +96905,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-f32-vcvt_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-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -94755,17 +96969,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-f32-vcvt_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-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -94849,19 +97060,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_riscv64") {
++  source_set("qs8-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-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" ]
@@ -94898,19 +97107,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_riscv64_standalone") {
++  source_set("qs8-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-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 = [
@@ -94986,16 +97193,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-rdminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc2w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-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 = [
@@ -95055,16 +97263,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc2w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-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 = [
@@ -95133,15 +97342,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_riscv64") {
++  source_set("qs8-qc4w-gemm_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-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" ]
@@ -95178,15 +97387,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_riscv64_standalone") {
++  source_set("qs8-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "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 = [
@@ -95264,7 +97473,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-rminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95272,8 +97481,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -95335,7 +97545,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95343,8 +97553,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -95425,15 +97636,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_riscv64") {
++  source_set("qs8-qc8w-dwconv_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-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" ]
@@ -95488,15 +97703,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_riscv64_standalone") {
++  source_set("qs8-qc8w-dwconv_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-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 = [
@@ -95586,14 +97805,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_riscv64") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -95630,14 +97851,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qu8-packw_riscv64_standalone") {
++  source_set("qs8-qc8w-gemm_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-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 = [
@@ -95747,15 +97970,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vbinary_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qs8-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 = [
@@ -95849,15 +98072,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.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"
 +    ]
  
 -      deps = [
@@ -95926,14 +98149,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_riscv64") {
++  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-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" ]
@@ -95970,14 +98195,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_riscv64_standalone") {
++  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.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 = [
@@ -96055,15 +98282,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vcopysign_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-igemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.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 = [
@@ -96125,15 +98352,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-igemm_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-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      deps = [
@@ -96216,14 +98443,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_riscv64") {
++  source_set("qs8-qu8-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96280,14 +98507,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_riscv64_standalone") {
++  source_set("qs8-qu8-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
@@ -96331,7 +98558,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vexp_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96339,7 +98566,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -96397,7 +98624,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96405,7 +98632,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -96486,15 +98713,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_riscv64") {
++  source_set("qs8-rdsum_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96549,15 +98775,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_riscv64_standalone") {
++  source_set("qs8-rdsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      sources = [
@@ -96601,7 +98826,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlog_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96609,7 +98834,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -96667,7 +98892,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96675,7 +98900,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -96745,15 +98970,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-neonfma-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_riscv64") {
++  source_set("qs8-rsum_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96790,15 +99014,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_riscv64_standalone") {
++  source_set("qs8-rsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -96883,7 +99106,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vrnd_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96891,7 +99114,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -96960,7 +99183,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96968,7 +99191,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -97051,14 +99274,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_riscv64") {
++  source_set("qs8-vadd_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97114,14 +99338,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_riscv64_standalone") {
++  source_set("qs8-vadd_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -97165,7 +99390,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsin_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97173,7 +99398,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -97231,7 +99456,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97239,7 +99464,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -97320,14 +99545,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_riscv64") {
++  source_set("qs8-vaddc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97382,14 +99608,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_riscv64_standalone") {
++  source_set("qs8-vaddc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -97510,7 +99737,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97518,7 +99745,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97594,7 +99821,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97602,7 +99829,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -97672,14 +99899,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_riscv64") {
++  source_set("qs8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -97728,14 +99955,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_riscv64_standalone") {
++  source_set("qs8-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -97813,7 +100040,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("pf32-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97821,7 +100048,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -97881,7 +100108,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97889,7 +100116,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -97970,14 +100197,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_riscv64") {
++  source_set("qs8-vlrelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -98032,14 +100259,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_riscv64_standalone") {
++  source_set("qs8-vlrelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -98084,14 +100311,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_riscv64") {
++  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -98150,14 +100378,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_riscv64_standalone") {
++  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -98238,14 +100467,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_riscv64") {
++  source_set("qs8-vmul_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -98300,14 +100529,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_riscv64_standalone") {
++  source_set("qs8-vmul_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -98351,14 +100580,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_riscv64") {
++  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -98416,14 +100646,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_riscv64_standalone") {
++  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -98505,16 +100736,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vmulc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -98570,16 +100799,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vmulc_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -98622,17 +100849,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc2w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_riscv64") {
++  source_set("qs8-vprelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -98679,17 +100903,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_riscv64_standalone") {
++  source_set("qs8-vprelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -98733,15 +100954,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vpreluc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -98799,15 +101019,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vpreluc_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/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      deps = [
@@ -98876,14 +101095,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c8-minmax-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_riscv64") {
++  source_set("qs8-vrpreluc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -98920,14 +101139,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_riscv64_standalone") {
++  source_set("qs8-vrpreluc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -99003,7 +101222,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99011,8 +101230,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -99072,7 +101291,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99080,8 +101299,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -99144,15 +101363,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_riscv64") {
++  source_set("qu8-dwconv_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"
++      "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
@@ -99189,15 +101410,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_riscv64_standalone") {
++  source_set("qu8-dwconv_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"
++      "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" ]
@@ -99260,20 +101483,53 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
 -        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c",
 -      ]
--
++if (build_with_chromium) {
++  source_set("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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d") {
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-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("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99281,11 +101537,32 @@ Index: chromium-148.0.7778.96/third_party/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-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 -    }
 -  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -99293,21 +101570,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-  if (build_with_chromium) {
+-    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",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f16-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" ]
@@ -99319,34 +101597,30 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
 +    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("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++if (build_with_chromium) {
++  source_set("qu8-f32-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -99366,6 +101640,60 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c2s4-minmax-neonfp16arith-mlal.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-f32-vcvt_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -99385,16 +101713,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-    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/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c4-minmax-neondotfp16arith.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c4-minmax-neondotfp16arith.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-neondotfp16arith.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x8c4-minmax-neondotfp16arith.c",
+-        "src/src/qd8-f16-qc8w-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" ]
@@ -99421,36 +101747,65 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
--
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
++if (build_with_chromium) {
++  source_set("qu8-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"
++    ]
+ 
+-      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-1x8c2s4-minmax-neonfp16arith-mlal.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qu8-igemm_riscv64") {
++# 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/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-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -99463,19 +101818,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+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-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c2s4-minmax-neonfp16arith-mlal.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-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" ]
@@ -99495,87 +101853,57 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 -
--      asmflags = cflags
-+# 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/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-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" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//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("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",
@@ -99585,8 +101913,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-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" ]
@@ -99612,25 +101940,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qd8-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-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-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" ]
@@ -99665,23 +101993,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_riscv64") {
++  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-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-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-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" ]
@@ -99709,8 +102039,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    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",
@@ -99720,8 +102050,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c4-minmax-neondot.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c4-minmax-neondot.c",
+-        "src/src/qd8-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" ]
 +  }
@@ -99733,14 +102063,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_riscv64_standalone") {
++  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -99766,14 +102098,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qd8-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/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c4-minmax-neondot.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c4-minmax-neondot.c",
+-        "src/src/qd8-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" ]
@@ -99800,61 +102132,148 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qd8-f32-qb4w-gemm_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16-minmax-neon-mlal-lane.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-6x16-minmax-neon-mlal-lane.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-igemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      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" ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f32-qb4w-gemm_arm64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16-minmax-neon-mlal-lane.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-6x16-minmax-neon-mlal-lane.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc2w-gemm_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-igemm_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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c4-minmax-neondot.c",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-2x8c4-minmax-neondot.c",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c4-minmax-neondot.c",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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" ]
--    }
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qb4w-gemm_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-rsum_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
++if (build_with_chromium) {
++  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99862,13 +102281,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c8-minmax-neoni8mm.c",
+-        "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" ]
@@ -99889,35 +102309,58 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qb4w-gemm_arm64") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc2w-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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16-minmax-neon-mlal-lane.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-6x16-minmax-neon-mlal-lane.c",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -99935,25 +102378,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qb4w-gemm_arm64_standalone") {
+-    source_set("qd8-f32-qc2w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_riscv64") {
++  source_set("qu8-rdsum_riscv64") {
 +    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 = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16-minmax-neon-mlal-lane.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-6x16-minmax-neon-mlal-lane.c",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -99981,7 +102421,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
+-    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -99992,9 +102432,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c4-minmax-neondot.c",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-2x8c4-minmax-neondot.c",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c4-minmax-neondot.c",
+-        "src/src/qd8-f32-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" ]
 +  }
@@ -100006,14 +102445,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_riscv64_standalone") {
++  source_set("qu8-rdsum_riscv64_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 = [
@@ -100039,15 +102478,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-    source_set("qd8-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-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c4-minmax-neondot.c",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-2x8c4-minmax-neondot.c",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c4-minmax-neondot.c",
+-        "src/src/qd8-f32-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" ]
@@ -100074,27 +102512,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc2w-gemm_arm64") {
--      cflags = []
+-    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "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-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100102,127 +102529,58 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc2w-gemm_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c",
--      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
-+if (build_with_chromium) {
-+  source_set("qu8-vadd_riscv64") {
+-    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c",
+-        "src/src/qd8-f32-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" ]
@@ -100250,55 +102608,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
-+    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-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("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"
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-    source_set("qd8-f32-qc4w-gemm_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -100306,16 +102617,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-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-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-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" ]
@@ -100327,72 +102634,30 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc4w-gemm_arm64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-6x16-minmax-neon-mlal-lane.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -100421,6 +102686,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -100430,15 +102707,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -100516,15 +102792,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_riscv64") {
++  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      asmflags = cflags
@@ -100561,15 +102837,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_riscv64_standalone") {
++  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -100633,15 +102909,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vadd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.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" ]
@@ -100678,15 +102954,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vadd_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -100765,14 +103041,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_riscv64") {
++  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -100825,14 +103102,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_riscv64_standalone") {
++  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -100910,15 +103188,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vaddc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      asmflags = cflags
@@ -100955,15 +103233,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vaddc_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -101027,14 +103305,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_riscv64") {
++  source_set("qu8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -101071,14 +103350,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_riscv64_standalone") {
++  source_set("qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -101159,15 +103439,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-igemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -101233,15 +103512,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -101322,14 +103600,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_riscv64") {
++  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -101383,14 +103662,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_riscv64_standalone") {
++  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -101435,15 +103715,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -101501,15 +103780,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vlrelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      deps = [
@@ -101589,14 +103867,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_riscv64") {
++  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-f32-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -101651,14 +103930,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_riscv64_standalone") {
++  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -101703,14 +103983,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_riscv64") {
++  source_set("qu8-vmul_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -101768,14 +104048,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_riscv64_standalone") {
++  source_set("qu8-vmul_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -101837,20 +104117,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_riscv64") {
++  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -101871,15 +104147,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -101890,14 +104171,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_riscv64_standalone") {
++  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -101978,14 +104260,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-dwconv_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_riscv64") {
++  source_set("qu8-vmulc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -102047,14 +104329,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_riscv64_standalone") {
++  source_set("qu8-vmulc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -102122,16 +104404,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("reference_riscv64") {
++  source_set("qu8-vprelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -102168,16 +104448,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("reference_riscv64_standalone") {
++  source_set("qu8-vprelu_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/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -102253,14 +104531,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_riscv64") {
++  source_set("qu8-vpreluc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -102320,14 +104598,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_riscv64_standalone") {
++  source_set("qu8-vpreluc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -      deps = [
@@ -102410,14 +104688,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_riscv64") {
++  source_set("qu8-vrpreluc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -102476,14 +104754,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_riscv64_standalone") {
++  source_set("qu8-vrpreluc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -102527,16 +104805,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("reference_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/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -102585,16 +104863,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("reference_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/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -      sources = [
@@ -102664,15 +104942,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_riscv64") {
++  source_set("s8-ibilinear_riscv64") {
 +    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-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -102731,15 +105008,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_riscv64_standalone") {
++  source_set("s8-ibilinear_riscv64_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-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -102827,7 +105103,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102835,9 +105111,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-rvv-u8v.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -102914,7 +105188,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102922,9 +105196,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-rvv-u8v.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -102996,16 +105268,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c8-minmax-fp32-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_riscv64") {
++  source_set("s8-maxpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -103042,16 +105312,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_riscv64_standalone") {
++  source_set("s8-maxpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -103161,7 +105429,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -103169,7 +105437,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -103246,7 +105515,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# 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("s8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -103254,7 +105523,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -103314,14 +105584,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -
 -      asmflags = cflags
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_riscv64") {
++  source_set("s8-rdminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-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 = [
@@ -103387,14 +105658,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_riscv64_standalone") {
++  source_set("s8-rdminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-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 = [
@@ -103480,42 +105752,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("subgraph_riscv64") {
++  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-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" ]
@@ -103575,42 +105822,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_riscv64_standalone") {
++  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-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 = [
@@ -103653,22 +105875,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qu8-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("tables_riscv64") {
++  source_set("s8-rminmax_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/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 = [
@@ -103725,22 +105941,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_riscv64_standalone") {
++  source_set("s8-rminmax_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/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 = [
@@ -103820,14 +106030,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_riscv64") {
++  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -103881,14 +106092,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_riscv64_standalone") {
++  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -103958,14 +106170,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_riscv64") {
++  source_set("s8-vclamp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -104014,14 +106226,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_riscv64_standalone") {
++  source_set("s8-vclamp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -104099,14 +106311,42 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vaddc_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_riscv64") {
++  source_set("subgraph_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/rope.c",
++    "src/src/subgraph/softmax.c",
++    "src/src/subgraph/space-to-depth-2d.c",
++    "src/src/subgraph/static-constant-pad.c",
++    "src/src/subgraph/static-reduce.c",
++    "src/src/subgraph/static-resize-bilinear-2d.c",
++    "src/src/subgraph/static-slice.c",
++    "src/src/subgraph/static-transpose.c",
++    "src/src/subgraph/subgraph-utils.c",
++    "src/src/subgraph/unary.c",
++    "src/src/subgraph/unpooling-2d.c",
++    "src/src/subgraph/validation.c"
 +    ]
  
 -      sources = [
@@ -104166,14 +106406,42 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_riscv64_standalone") {
++  source_set("subgraph_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/rope.c",
++    "src/src/subgraph/softmax.c",
++    "src/src/subgraph/space-to-depth-2d.c",
++    "src/src/subgraph/static-constant-pad.c",
++    "src/src/subgraph/static-reduce.c",
++    "src/src/subgraph/static-resize-bilinear-2d.c",
++    "src/src/subgraph/static-slice.c",
++    "src/src/subgraph/static-transpose.c",
++    "src/src/subgraph/subgraph-utils.c",
++    "src/src/subgraph/unary.c",
++    "src/src/subgraph/unpooling-2d.c",
++    "src/src/subgraph/validation.c"
 +    ]
  
 -      deps = [
@@ -104254,16 +106522,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("tables_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/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -104318,16 +106592,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("tables_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
++      "src/src/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 = [
@@ -104371,15 +106651,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vmul_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_riscv64") {
++  source_set("u8-ibilinear_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"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -104437,15 +106716,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_riscv64_standalone") {
++  source_set("u8-ibilinear_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/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      deps = [
@@ -104525,17 +106803,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-lut32norm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-rvv-u8v.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -104589,17 +106864,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("u8-lut32norm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-rvv-u8v.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      sources = [
@@ -104642,16 +106914,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vpreluc_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_riscv64") {
++  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -104707,16 +106978,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_riscv64_standalone") {
++  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -104800,15 +107070,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-maxpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -104867,15 +107136,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("u8-maxpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -104919,14 +107187,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-f32-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_riscv64") {
++  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -104968,22 +107238,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      asmflags = cflags
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
-+
+ 
+-      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_riscv64_standalone") {
++  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -105029,14 +107301,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("x16-transposec_riscv64") {
++  source_set("u8-rdminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.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" ]
@@ -105087,14 +107360,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_riscv64_standalone") {
++  source_set("u8-rdminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -105178,15 +107452,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_riscv64") {
++  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/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"
 +    ]
  
 -      asmflags = cflags
@@ -105225,15 +107501,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-x32-packw_riscv64_standalone") {
++  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -105316,14 +107594,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x24-transposec_riscv64") {
++  source_set("u8-rminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.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" ]
@@ -105383,14 +107663,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_riscv64_standalone") {
++  source_set("u8-rminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.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 = [
@@ -105435,7 +107717,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-rdsum_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x32-packw_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -105443,7 +107725,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
++      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -105502,7 +107784,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -105510,7 +107792,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
++      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -105593,19 +107875,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x32-packw_riscv64") {
++  source_set("u8-vclamp_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/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -105662,19 +107939,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_riscv64_standalone") {
++  source_set("u8-vclamp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -105770,18 +108042,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x32-transposec_arch=rv64gcv-abi=lp64d") {
++  source_set("x16-transposec_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -105836,18 +108104,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("x16-transposec_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -105891,14 +108155,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vlrelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x32-transposec_riscv64") {
++  source_set("x16-x32-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
@@ -105956,14 +108221,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_riscv64_standalone") {
++  source_set("x16-x32-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
 +    ]
  
 -      deps = [
@@ -106044,14 +108310,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x32-unpool_riscv64") {
++  source_set("x24-transposec_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106106,14 +108372,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_riscv64_standalone") {
++  source_set("x24-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
  
 -      sources = [
@@ -106156,14 +108422,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vprelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x64-transposec_riscv64") {
++  source_set("x32-packw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
 +    ]
  
 -      sources = [
@@ -106219,14 +108486,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_riscv64_standalone") {
++  source_set("x32-packw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
 +    ]
  
 -      deps = [
@@ -106305,14 +108573,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x8-lut_riscv64") {
++  source_set("x32-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106366,14 +108639,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_riscv64_standalone") {
++  source_set("x32-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.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 = [
@@ -106418,14 +108696,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("reference_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-packq_riscv64") {
++  source_set("x32-transposec_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-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",
++    "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"
 +    ]
  
 -      sources = [
@@ -106485,14 +108770,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_riscv64_standalone") {
++  source_set("x32-transposec_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-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",
++    "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"
 +    ]
  
 -      deps = [
@@ -106574,17 +108866,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x8-packw_riscv64") {
++  source_set("x32-transposec_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106639,17 +108928,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packw_riscv64_standalone") {
++  source_set("x32-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -106749,14 +109035,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x8-transposec_riscv64") {
++  source_set("x32-unpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106815,14 +109101,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_riscv64_standalone") {
++  source_set("x32-unpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
 -      sources = [
@@ -106892,14 +109178,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("xx-copy_riscv64") {
++  source_set("x64-transposec_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -106973,14 +109259,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_riscv64_standalone") {
++  source_set("x64-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -107088,14 +109374,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("tables_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("xx-fill_riscv64") {
++  source_set("x8-lut_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -107129,218 +109415,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("u8-ibilinear_arm64") {
--      cflags = []
-+# 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"
-+    ]
- 
--      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",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("u8-ibilinear_arm64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("xx-pad_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
-+    ]
- 
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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("u8-lut32norm_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("u8-lut32norm_arm64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("xx-transposev_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
 -  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -107348,7 +109422,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("u8-maxpool_arm64") {
+-    source_set("u8-ibilinear_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -107359,8 +109433,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c",
+-        "src/src/u8-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" ]
 +  }
@@ -107372,14 +109447,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-transposev_riscv64_standalone") {
++  source_set("x8-lut_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -107405,14 +109480,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-maxpool_arm64_standalone") {
+-    source_set("u8-ibilinear_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c",
+-        "src/src/u8-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" ]
@@ -107439,16 +109515,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("u8-rdminmax_arm64") {
+-    source_set("u8-lut32norm_arm64") {
 -      cflags = []
-+}
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c",
--        "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
--        "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c",
--        "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c",
+-        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -107462,39 +109534,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (current_cpu == "ppc64") {
 +if (build_with_chromium) {
-+  source_set("configs_ppc64") {
++  source_set("x8-packq_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"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107507,7 +109555,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-rdminmax_arm64_standalone") {
+-    source_set("u8-lut32norm_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -107518,10 +109566,7 @@ Index: chromium-148.0.7778.96/third_party/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/u8-lut32norm/u8-lut32norm-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -107547,93 +109592,65 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("u8-rminmax_arm64") {
+-    source_set("u8-maxpool_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("configs_ppc64_standalone") {
++  source_set("x8-packq_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"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.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/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" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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("u8-rminmax_arm64_standalone") {
+-    source_set("u8-maxpool_arm64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
--        "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
--        "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
--        "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
--        "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
--        "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c",
+-        "src/src/u8-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" ]
@@ -107653,45 +109670,43 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("u8-vclamp_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",
--      ]
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("enums_ppc64") {
++  source_set("x8-packw_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"
++      "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" ]
+-  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",
@@ -107713,28 +109728,29 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-vclamp_arm64_standalone") {
+-    source_set("u8-rdminmax_arm64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("enums_ppc64_standalone") {
++  source_set("x8-packw_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"
++      "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/u8-vclamp/u8-vclamp-neon-u64.c",
--        "src/src/u8-vclamp/u8-vclamp-scalar-u4.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" ]
@@ -107762,8 +109778,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    source_set("u8-rminmax_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -107773,10 +109789,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
--        "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
--        "src/src/x16-pack-lh/x16-packlh-neonsme.c",
--        "src/src/x16-pack-lh/x16-packlh-neonsme2.c",
+-        "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" ]
@@ -107801,25 +109819,27 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    source_set("u8-rminmax_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_ppc64") {
++  source_set("x8-transposec_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      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/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" ]
@@ -107847,7 +109867,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("x16-packw_arm64") {
+-    source_set("u8-vclamp_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -107858,8 +109878,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      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/u8-vclamp/u8-vclamp-neon-u64.c",
+-        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -107871,14 +109891,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_ppc64_standalone") {
++  source_set("x8-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      deps = [
@@ -107904,14 +109924,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x16-packw_arm64_standalone") {
+-    source_set("u8-vclamp_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/u8-vclamp/u8-vclamp-neon-u64.c",
+-        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -107938,13 +109958,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x16-transposec_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/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
--        "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c",
+-        "src/src/x16-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" ]
@@ -107959,14 +109981,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_ppc64") {
++  source_set("xx-copy_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107979,8 +110001,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x16-transposec_arm64_standalone") {
--      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",
@@ -107990,8 +110012,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
--        "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c",
+-        "src/src/x16-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" ]
@@ -108017,24 +110041,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x16-x32-packw_arm64") {
+-    source_set("x16-packw_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_ppc64_standalone") {
++  source_set("xx-copy_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
--        "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c",
+-        "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" ]
@@ -108069,23 +110093,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x16-x32-packw_arm64_standalone") {
+-    source_set("x16-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_ppc64") {
++  source_set("xx-fill_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
--        "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c",
+-        "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" ]
@@ -108113,7 +110137,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("x24-transposec_arm64") {
+-    source_set("x16-transposec_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -108124,9 +110148,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
--        "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
--        "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c",
+-        "src/src/x16-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" ]
 +  }
@@ -108138,14 +110161,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qu8-vcvt_ppc64_standalone") {
++  source_set("xx-fill_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -      deps = [
@@ -108171,15 +110194,94 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x24-transposec_arm64_standalone") {
+-    source_set("x16-transposec_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
--        "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
--        "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c",
+-        "src/src/x16-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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("x16-x32-packw_arm64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
+-        "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++if (build_with_chromium) {
++  source_set("xx-pad_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("x16-x32-packw_arm64_standalone") {
+-      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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -108199,16 +110301,134 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("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"
++    ]
+ 
+-      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",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/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" ]
      }
    }
 +}
  
--  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("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"
++    ]
+ 
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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("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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x32-pack-lh/x32-packlh-igemm-neonsme.c",
@@ -108228,37 +110448,27 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-rdminmax_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # 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" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("x32-pack-lh_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/x32-pack-lh/x32-packlh-igemm-neonsme.c",
@@ -108284,26 +110494,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("x32-packw_arm64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
-+    ]
++}
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -108331,27 +110531,37 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++if (current_cpu == "ppc64") {
++if (build_with_chromium) {
++  source_set("bf16-f32-vcvt_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("x32-packw_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//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-packw_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
@@ -108384,64 +110594,76 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("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"
++    ]
+ 
 -      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" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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-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"
-+    ]
++    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("x32-transposec_arm64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++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 = [
@@ -108469,6 +110691,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -108478,16 +110712,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_ppc64_standalone") {
++  source_set("bf16-qs8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -108531,14 +110763,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x32-unpool_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_ppc64") {
++  source_set("bf16-rminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -108597,14 +110831,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_ppc64_standalone") {
++  source_set("bf16-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      deps = [
@@ -108674,14 +110910,37 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/x8-lut/gen/x8-lut-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vcos_ppc64") {
++  source_set("configs_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.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" ]
@@ -108718,14 +110977,37 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_ppc64_standalone") {
++  source_set("configs_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.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 = [
@@ -108801,14 +111083,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("f16-vexp_ppc64") {
++  source_set("enums_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.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 = [
@@ -108868,14 +111154,287 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_ppc64_standalone") {
++  source_set("enums_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/enums/allocation-type.c",
++    "src/src/enums/datatype-strings.c",
++    "src/src/enums/microkernel-type.c",
++    "src/src/enums/node-type.c",
++    "src/src/enums/operator-type.c"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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_arm64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      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 (!(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",
+-      ]
++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"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_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-packw_arm64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      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" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("x8-transposec_arm64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
+-        "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool: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("x8-transposec_arm64_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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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("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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      deps = [
@@ -108901,14 +111460,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x8-packq_arm64_standalone") {
+-    source_set("xx-copy_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/xx-copy/xx-copy-scalar-memcpy.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -108935,15 +111493,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x8-packw_arm64") {
+-    source_set("xx-fill_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/xx-fill/xx-fill-neon-u64.c",
+-        "src/src/xx-fill/xx-fill-scalar-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -108958,14 +111514,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_ppc64") {
++  source_set("f16-qu8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108978,7 +111534,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x8-packw_arm64_standalone") {
+-    source_set("xx-fill_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -108989,10 +111545,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
--        "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
--        "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
--        "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c",
+-        "src/src/xx-fill/xx-fill-neon-u64.c",
+-        "src/src/xx-fill/xx-fill-scalar-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109018,24 +111572,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x8-transposec_arm64") {
+-    source_set("xx-pad_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_ppc64_standalone") {
++  source_set("f16-qu8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-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/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" ]
@@ -109070,23 +111624,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x8-transposec_arm64_standalone") {
+-    source_set("xx-pad_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vsin_ppc64") {
++  source_set("f16-rdminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
 -        "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/xx-pad/xx-pad-p16-neon-u16.c",
+-        "src/src/xx-pad/xx-pad-p4-scalar-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109107,60 +111662,51 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("xx-copy_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" ]
+-  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-vsin_ppc64_standalone") {
++  source_set("f16-rdminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    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",
@@ -109168,95 +111714,41 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("xx-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",
+-        "//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("xx-fill_arm64") {
+-  # 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-fill/xx-fill-neon-u64.c",
--        "src/src/xx-fill/xx-fill-scalar-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_ppc64") {
++  source_set("f16-rminmax_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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("xx-fill_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-fill/xx-fill-neon-u64.c",
--        "src/src/xx-fill/xx-fill-scalar-u16.c",
+-        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109277,29 +111769,43 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
-+}
+ }
  
+-if (current_cpu == "riscv64") {
 -  if (build_with_chromium) {
--    source_set("xx-pad_arm64") {
+-    source_set("bf16-f32-vcvt_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("f16-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
 +    ]
  
 -      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/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -109334,23 +111840,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-pad_arm64_standalone") {
+-    source_set("bf16-f32-vcvt_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_ppc64") {
++  source_set("f16-vapproxgelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-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/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109378,7 +111883,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("xx-transposev_arm64") {
+-    source_set("bf16-qs8-vcvt_riscv64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -109389,7 +111894,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -109401,14 +111906,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_ppc64_standalone") {
++  source_set("f16-vapproxgelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      deps = [
@@ -109434,13 +111939,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-transposev_arm64_standalone") {
+-    source_set("bf16-qs8-vcvt_riscv64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109464,15 +111969,116 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      assert_no_deps = [ "//base" ]
      }
    }
- }
++}
  
--if (current_cpu == "riscv64") {
 -  if (build_with_chromium) {
--    source_set("configs_riscv64") {
+-    source_set("bf16-rminmax_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
+-        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-vcos_ppc64") {
++    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" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      deps = [
+-        "//third_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_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"
++    ]
+ 
+-      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_riscv64") {
+-      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",
@@ -109510,36 +112116,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("configs_riscv64_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",
@@ -109586,14 +112176,26 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++if (build_with_chromium) {
++  source_set("f16-vexp_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.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" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/enums/allocation-type.c",
@@ -109614,31 +112216,35 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("enums_riscv64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_ppc64_standalone") {
++  source_set("f16-vexp_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("enums_riscv64_standalone") {
--      cflags = []
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/enums/allocation-type.c",
@@ -109667,12 +112273,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
@@ -109700,14 +112304,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -109742,25 +112349,11 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
@@ -109785,20 +112378,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("f16-vgelu_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-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) {
@@ -109831,6 +112428,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -109840,21 +112444,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_ppc64_standalone") {
++  source_set("f16-vgelu_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/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -109896,7 +112493,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-f32-vcvt_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",
@@ -109921,25 +112528,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-dwconv_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d") {
@@ -109964,14 +112556,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -109979,6 +112563,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -110010,9 +112600,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vsin_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
@@ -110037,35 +112636,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -110096,14 +112681,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
@@ -110128,14 +112712,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++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" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -110168,17 +112762,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++    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") {
@@ -110203,20 +112796,25 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-argmaxpool_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.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) {
@@ -110249,9 +112847,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
@@ -110277,25 +112879,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -110330,11 +112921,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++if (build_with_chromium) {
++  source_set("f32-avgpool_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -110361,14 +112956,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -110402,85 +113003,142 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+if (build_with_chromium) {
-+  source_set("f32-gemm_ppc64") {
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  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-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
--  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" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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",
 +    ]
  
--      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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && 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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-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" ]
+-      }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-qu8-vcvt_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-bf16-vcvt_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-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
--      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",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    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",
@@ -110488,15 +113146,39 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-qs8-vcvt_riscv64_standalone") {
+-    source_set("f16-qu8-vcvt_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("f32-conv-hwc2chw_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110516,40 +113198,30 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-qu8-vcvt_riscv64") {
--      cflags = []
+-    source_set("f16-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -110571,23 +113243,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-qu8-vcvt_riscv64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
-+    ]
- 
+-    source_set(
+-        "f16-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110609,10 +113274,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-conv-hwc2chw_ppc64_standalone") {
++    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-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
@@ -110638,6 +113310,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -110645,11 +113325,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -110681,6 +113356,8 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -110697,14 +113374,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_ppc64") {
++  source_set("f32-dwconv2d-chw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110741,14 +113425,21 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear_ppc64_standalone") {
++  source_set("f32-dwconv2d-chw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
 +    ]
  
 -      sources = [
@@ -110867,21 +113558,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_ppc64") {
++  source_set("f32-dwconv_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-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
++      "src/src/f32-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" ]
@@ -110918,21 +113611,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_ppc64_standalone") {
++  source_set("f32-dwconv_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-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
++      "src/src/f32-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 = [
@@ -111046,14 +113741,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_ppc64") {
++  source_set("f32-f16-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111090,14 +113785,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_ppc64_standalone") {
++  source_set("f32-f16-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      sources = [
@@ -111237,7 +113932,388 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
+-    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",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-gemm_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      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" ]
+-      }
+-    }
++    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_riscv64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-gemm_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-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-vcos/gen/f16-vcos-scalar-rational-3-2-div.c",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && 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_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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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("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") {
++    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-vexp/gen/f16-vexp-scalar-poly-3.c",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && 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_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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-vgelu_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",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-ibilinear/gen/f32-ibilinear-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("f16-vgelu_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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -111245,7 +114321,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c",
+-        "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111260,15 +114336,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_ppc64") {
++  source_set("f32-igemm_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-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" ]
@@ -111281,7 +114361,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -111289,7 +114369,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c",
+-        "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111322,34 +114402,85 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vcos_riscv64") {
--      cflags = []
+-    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-qc4w-gemm_ppc64_standalone") {
++  source_set("f32-igemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-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/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("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c",
+-      ]
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111357,6 +114488,26 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vrnd/gen/f16-vrndd-rvvfp16arith-u8v.c",
+-        "src/src/f16-vrnd/gen/f16-vrndne-rvvfp16arith-u8v.c",
+-        "src/src/f16-vrnd/gen/f16-vrndu-rvvfp16arith-u8v.c",
+-        "src/src/f16-vrnd/gen/f16-vrndz-rvvfp16arith-u8v.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -111374,23 +114525,60 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vcos_riscv64_standalone") {
--      cflags = []
+-    source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vrnd/gen/f16-vrndd-rvvfp16arith-u8v.c",
+-        "src/src/f16-vrnd/gen/f16-vrndne-rvvfp16arith-u8v.c",
+-        "src/src/f16-vrnd/gen/f16-vrndu-rvvfp16arith-u8v.c",
+-        "src/src/f16-vrnd/gen/f16-vrndz-rvvfp16arith-u8v.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_ppc64") {
++  source_set("f32-maxpool_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-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.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-vcos/gen/f16-vcos-scalar-rational-3-2-div.c",
+-        "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111402,50 +114590,76 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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-vexp_riscv64") {
+-    source_set("f16-vsin_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_ppc64_standalone") {
++  source_set("f32-maxpool_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
+-        "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" ]
@@ -111480,23 +114694,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vexp_riscv64_standalone") {
+-    source_set("f16-vsin_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_ppc64") {
++  source_set("f32-qc4w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-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/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
+-        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111524,70 +114738,52 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vgelu_riscv64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  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",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-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("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111607,80 +114803,74 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f16-vsin_riscv64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_ppc64") {
+-    }
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-qc4w-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-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-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",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsin_riscv64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
-+    ]
- 
+-    source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-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" ]
@@ -111700,25 +114890,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("f16-vunary_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-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-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111732,31 +114921,37 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++if (build_with_chromium) {
++  source_set("f32-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"
 +    ]
  
 -      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("f16-vunary_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-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-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111776,61 +114971,88 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
--
+-    source_set("f32-argmaxpool_riscv64") {
+-      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/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.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" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-argmaxpool_riscv64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_ppc64") {
++  source_set("f32-qs8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
--  # 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",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111858,7 +115080,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-argmaxpool_riscv64") {
+-    source_set("f32-avgpool_riscv64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -111869,7 +115091,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -111881,14 +115103,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_ppc64_standalone") {
++  source_set("f32-qs8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      deps = [
@@ -111914,13 +115137,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-argmaxpool_riscv64_standalone") {
+-    source_set("f32-avgpool_riscv64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111947,23 +115170,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-avgpool_riscv64") {
+-    source_set("f32-bf16-vcvt_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_ppc64") {
++  source_set("f32-qu8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
++      "src/src/f32-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" ]
@@ -111996,24 +115219,24 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-avgpool_riscv64_standalone") {
+-    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-rdminmax_ppc64_standalone") {
++  source_set("f32-qu8-vcvt_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-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/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112120,14 +115343,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_ppc64") {
++  source_set("f32-raddstoreexpminusmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112164,14 +115387,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_ppc64_standalone") {
++  source_set("f32-raddstoreexpminusmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      sources = [
@@ -112280,20 +115503,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-dwconv2d-chw_riscv64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_ppc64") {
++  source_set("f32-rdminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -112318,15 +115537,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -112337,14 +115561,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_ppc64_standalone") {
++  source_set("f32-rdminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -112472,22 +115697,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-dwconv_riscv64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_ppc64") {
++  source_set("f32-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -112514,15 +115732,20 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -112533,16 +115756,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_ppc64_standalone") {
++  source_set("f32-rdsum2_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -112663,14 +115884,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_ppc64") {
++  source_set("f32-rdsum_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112707,14 +115928,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_ppc64_standalone") {
++  source_set("f32-rdsum_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -112826,12 +116047,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c",
 -      ]
 -
@@ -112847,14 +116066,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum_ppc64") {
++  source_set("f32-rminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -112879,12 +116100,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
 -        "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c",
 -      ]
 -
@@ -112915,14 +116134,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_ppc64_standalone") {
++  source_set("f32-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -112965,16 +116186,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-ibilinear-chw_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-spmm_ppc64") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -113030,16 +116249,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_ppc64_standalone") {
++  source_set("f32-rsum2_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"
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      deps = [
@@ -113122,14 +116339,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_ppc64") {
++  source_set("f32-rsum_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -113188,25 +116405,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_ppc64_standalone") {
++  source_set("f32-rsum_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c",
 -      ]
 -
@@ -113245,12 +116460,10 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
 -        "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c",
 -      ]
 -
@@ -113301,32 +116514,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_ppc64") {
++  source_set("f32-spmm_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-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" ]
@@ -113384,32 +116581,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_ppc64_standalone") {
++  source_set("f32-spmm_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-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 = [
@@ -113452,14 +116633,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-maxpool_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_ppc64") {
++  source_set("f32-vapproxgelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -113516,14 +116697,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_ppc64_standalone") {
++  source_set("f32-vapproxgelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      deps = [
@@ -113592,14 +116773,32 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_ppc64") {
++  source_set("f32-vbinary_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113636,14 +116835,32 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_ppc64_standalone") {
++  source_set("f32-vbinary_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -113757,16 +116974,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_ppc64") {
++  source_set("f32-vclamp_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-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113803,16 +117018,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_ppc64_standalone") {
++  source_set("f32-vclamp_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-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      sources = [
@@ -113926,14 +117139,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcos_ppc64") {
++  source_set("f32-vcmul_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113970,14 +117183,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_ppc64_standalone") {
++  source_set("f32-vcmul_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -114090,14 +117303,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-velu_ppc64") {
++  source_set("f32-vcopysign_ppc64") {
 +    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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114134,14 +117349,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_ppc64_standalone") {
++  source_set("f32-vcopysign_ppc64_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 = [
@@ -114256,14 +117473,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vexp_ppc64") {
++  source_set("f32-vcos_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114300,14 +117517,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_ppc64_standalone") {
++  source_set("f32-vcos_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -114420,14 +117637,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_ppc64") {
++  source_set("f32-velu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114464,14 +117681,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_ppc64_standalone") {
++  source_set("f32-velu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      sources = [
@@ -114583,14 +117800,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_ppc64") {
++  source_set("f32-vexp_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114627,14 +117844,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_ppc64_standalone") {
++  source_set("f32-vexp_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -114752,14 +117969,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlog_ppc64") {
++  source_set("f32-vgelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114796,14 +118013,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_ppc64_standalone") {
++  source_set("f32-vgelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -114917,14 +118134,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_ppc64") {
++  source_set("f32-vhswish_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114961,14 +118178,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_ppc64_standalone") {
++  source_set("f32-vhswish_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      sources = [
@@ -115080,14 +118297,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_ppc64") {
++  source_set("f32-vlog_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115124,14 +118341,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_ppc64_standalone") {
++  source_set("f32-vlog_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      sources = [
@@ -115261,17 +118478,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_ppc64") {
++  source_set("f32-vlrelu_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-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -115327,17 +118541,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_ppc64_standalone") {
++  source_set("f32-vlrelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -115405,15 +118616,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_ppc64") {
++  source_set("f32-vmulcaddc_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-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -115530,15 +118740,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_ppc64_standalone") {
++  source_set("f32-vmulcaddc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      sources = [
@@ -115666,14 +118875,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_ppc64") {
++  source_set("f32-vrnd_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -115731,14 +118943,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_ppc64_standalone") {
++  source_set("f32-vrnd_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-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 = [
@@ -115806,14 +119021,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vsin_ppc64") {
++  source_set("f32-vrsqrt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -115894,14 +119110,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_ppc64_standalone") {
++  source_set("f32-vrsqrt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -115943,20 +119160,191 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vcmul_riscv64_standalone") {
 -      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_ppc64") {
++  source_set("f32-vsigmoid_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-vcopysign_arch=rv64gcv-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
+-        "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
+-        "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/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-vcopysign_riscv64") {
+-      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-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",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && 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 = []
++if (build_with_chromium) {
++  source_set("f32-vsin_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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" ]
@@ -115984,7 +119372,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vcopysign_riscv64") {
+-    source_set("f32-vcos_riscv64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -115995,9 +119383,7 @@ Index: chromium-148.0.7778.96/third_party/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-vcos/gen/f32-vcos-scalar-rational-5-4-div.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -116009,14 +119395,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_ppc64_standalone") {
++  source_set("f32-vsin_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      deps = [
@@ -116042,15 +119428,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vcopysign_riscv64_standalone") {
+-    source_set("f32-vcos_riscv64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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" ]
@@ -116077,12 +119461,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vcos_riscv64") {
+-    source_set("f32-velu_riscv64") {
 -      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" ]
@@ -116097,14 +119481,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_ppc64") {
++  source_set("f32-vsqrt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -116117,7 +119501,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vcos_riscv64_standalone") {
+-    source_set("f32-velu_riscv64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -116128,7 +119512,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      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" ]
@@ -116154,23 +119538,23 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-velu_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-vtanh_ppc64_standalone") {
++  source_set("f32-vsqrt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -116205,24 +119589,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-velu_riscv64_standalone") {
+-    source_set("f32-vexp_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vunary_ppc64") {
++  source_set("f32-vtanh_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      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" ]
@@ -116250,7 +119632,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vexp_riscv64") {
+-    source_set("f32-vgelu_riscv64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -116261,7 +119643,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -116273,16 +119655,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_ppc64_standalone") {
++  source_set("f32-vtanh_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      deps = [
@@ -116308,13 +119688,13 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vexp_riscv64_standalone") {
+-    source_set("f32-vgelu_riscv64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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" ]
@@ -116341,81 +119721,149 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vgelu_riscv64") {
--      cflags = []
+-    source_set("f32-vhswish_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-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",
 -      ]
 +if (build_with_chromium) {
-+  source_set("operators_ppc64") {
++  source_set("f32-vunary_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/operators/argmax-pooling-nhwc.c",
-+    "src/src/operators/average-pooling-nhwc.c",
-+    "src/src/operators/batch-matrix-multiply-nc.c",
-+    "src/src/operators/binary-elementwise-nd.c",
-+    "src/src/operators/constant-pad-nd.c",
-+    "src/src/operators/convolution-nchw.c",
-+    "src/src/operators/convolution-nhwc.c",
-+    "src/src/operators/deconvolution-nhwc.c",
-+    "src/src/operators/dynamic-fully-connected-nc.c",
-+    "src/src/operators/fingerprint_cache.c",
-+    "src/src/operators/fingerprint_id.c",
-+    "src/src/operators/fully-connected-nc.c",
-+    "src/src/operators/max-pooling-nhwc.c",
-+    "src/src/operators/pack-lh.c",
-+    "src/src/operators/reduce-nd.c",
-+    "src/src/operators/resize-bilinear-nchw.c",
-+    "src/src/operators/resize-bilinear-nhwc.c",
-+    "src/src/operators/rope-nthc.c",
-+    "src/src/operators/slice-nd.c",
-+    "src/src/operators/softmax-nc.c",
-+    "src/src/operators/transpose-nd.c",
-+    "src/src/operators/unary-elementwise-nc.c",
-+    "src/src/operators/unpooling-nhwc.c"
++      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
++    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
++    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      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" ]
  
+-  # 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",
+-        "//third_party/pthreadpool: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 (build_with_chromium) {
+-    source_set("f32-vhswish_riscv64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vunary_ppc64_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/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" ]
++    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-vgelu_riscv64_standalone") {
+-    source_set("f32-vhswish_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("operators_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("operators_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -116449,7 +119897,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      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" ]
@@ -116477,28 +119925,75 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
--
+-    source_set("f32-vlog_riscv64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c",
+-        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("operators_ppc64_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"
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -116506,22 +120001,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vhswish_arch=rv64gcv-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
--
+-    source_set("f32-vlog_riscv64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c",
+-        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116548,12 +120036,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vhswish_riscv64") {
--      cflags = []
+-    source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vhswish/gen/f32-vhswish-scalar.c",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116588,18 +120079,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vhswish_riscv64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vhswish/gen/f32-vhswish-scalar.c",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116620,12 +120108,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vlog_riscv64") {
+-    source_set("f32-vlrelu_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -116641,7 +120136,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -116676,12 +120171,12 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vlog_riscv64_standalone") {
+-    source_set("f32-vlrelu_riscv64_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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116716,7 +120211,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -116724,7 +120219,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c",
+-        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116755,7 +120250,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # 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-vmulcaddc_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -116763,7 +120258,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c",
+-        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116789,7 +120284,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vlrelu_riscv64") {
+-    source_set("f32-vmulcaddc_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -116806,7 +120301,7 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
+-        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -116841,109 +120336,9 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vlrelu_riscv64_standalone") {
--      cflags = []
-+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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vmulcaddc_riscv64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vmulcaddc_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
@@ -116966,11 +120361,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("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"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
@@ -116998,26 +120400,21 @@ Index: chromium-148.0.7778.96/third_party/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"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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_arch=rv64gcv-abi=lp64d_standalone") {
@@ -117052,13 +120449,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -117068,15 +120458,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_ppc64_standalone") {
++  source_set("qd8-f32-qc2w-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -117174,16 +120563,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_ppc64") {
++  source_set("qd8-f32-qc4w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -117241,16 +120629,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_ppc64_standalone") {
++  source_set("qd8-f32-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 = [
@@ -117294,16 +120681,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vrsqrt_riscv64_standalone") {
 -      cflags = []
 +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"
 +    ]
  
 -      sources = [
@@ -117360,16 +120747,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_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"
 +    ]
  
 -      deps = [
@@ -117436,17 +120823,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117483,17 +120869,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_ppc64_standalone") {
++  source_set("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"
++      "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 = [
@@ -117617,14 +121002,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_ppc64") {
++  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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -117678,14 +121066,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_ppc64_standalone") {
++  source_set("qs8-dwconv_ppc64_standalone") {
 +    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"
 +    ]
  
 -      sources = [
@@ -117753,17 +121144,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-packw_ppc64") {
++  source_set("qs8-f32-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -117860,17 +121248,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-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"
 +    ]
  
 -      deps = [
@@ -117973,17 +121358,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -118059,17 +121444,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_ppc64_standalone") {
++  source_set("qs8-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"
 +    ]
  
 -      sources = [
@@ -118112,15 +121497,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc2w-gemm_riscv64_standalone") {
 -      cflags = []
 +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"
 +    ]
  
 -      sources = [
@@ -118224,15 +121611,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -118338,19 +121727,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -118409,19 +121794,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_ppc64_standalone") {
++  source_set("qs8-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"
 +    ]
  
 -      sources = [
@@ -118465,15 +121846,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qb4w-gemm_riscv64_standalone") {
 -      cflags = []
 +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"
 +    ]
  
 -      sources = [
@@ -118530,15 +121915,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_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"
 +    ]
  
 -      deps = [
@@ -118621,15 +122010,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -118688,15 +122077,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_ppc64_standalone") {
++  source_set("qs8-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 = [
@@ -118766,14 +122155,15 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -118856,14 +122246,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qu8-packw_ppc64_standalone") {
++  source_set("qs8-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 = [
@@ -118935,14 +122326,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -119025,14 +122416,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_ppc64_standalone") {
++  source_set("qs8-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 = [
@@ -119104,14 +122495,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -119194,14 +122585,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_ppc64_standalone") {
++  source_set("qs8-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 = [
@@ -119299,15 +122690,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -119365,15 +122755,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_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 = [
@@ -119441,15 +122830,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -119498,15 +122887,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_ppc64_standalone") {
++  source_set("qs8-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"
 +    ]
  
 -      sources = [
@@ -119584,14 +122973,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc2w-gemm_riscv64_standalone") {
 -      cflags = []
 +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"
 +    ]
  
 -      sources = [
@@ -119651,14 +123041,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_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"
 +    ]
  
 -      deps = [
@@ -119743,14 +123134,14 @@ Index: chromium-148.0.7778.96/third_party/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" ]
@@ -119810,14 +123201,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_ppc64_standalone") {
++  source_set("qs8-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 = [
@@ -119920,14 +123311,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -119986,14 +123377,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_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 = [
@@ -120063,14 +123454,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -120153,14 +123544,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_ppc64_standalone") {
++  source_set("qs8-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"
 +    ]
  
 -      sources = [
@@ -120204,14 +123595,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-igemm_riscv64_standalone") {
 -      cflags = []
 +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"
 +    ]
  
 -      sources = [
@@ -120268,14 +123659,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-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"
 +    ]
  
 -      deps = [
@@ -120357,14 +123748,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -120422,14 +123813,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_ppc64_standalone") {
++  source_set("qs8-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 = [
@@ -120497,14 +123888,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -120585,14 +123976,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_ppc64_standalone") {
++  source_set("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 = [
@@ -120660,17 +124051,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -120751,17 +124139,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_ppc64_standalone") {
++  source_set("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 = [
@@ -120831,14 +124216,17 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -120919,14 +124307,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_ppc64_standalone") {
++  source_set("qu8-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 = [
@@ -120996,15 +124387,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -121085,15 +124475,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_ppc64_standalone") {
++  source_set("qu8-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 = [
@@ -121161,15 +124550,15 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -121250,15 +124639,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_ppc64_standalone") {
++  source_set("qu8-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 = [
@@ -121326,14 +124715,15 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -121414,14 +124804,15 @@ Index: chromium-148.0.7778.96/third_party/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 = [
@@ -121489,14 +124880,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -121577,14 +124968,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_ppc64_standalone") {
++  source_set("qu8-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"
 +    ]
  
 -      sources = [
@@ -121627,15 +125018,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vmulc_riscv64_standalone") {
 -      cflags = []
 +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"
 +    ]
  
 -      sources = [
@@ -121691,15 +125081,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_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"
 +    ]
  
 -      deps = [
@@ -121778,15 +125167,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -121840,15 +125229,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_ppc64_standalone") {
++  source_set("qu8-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 = [
@@ -121916,14 +125305,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -122006,14 +125396,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_ppc64_standalone") {
++  source_set("qu8-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 = [
@@ -122111,14 +125502,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -122176,14 +125567,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_ppc64_standalone") {
++  source_set("qu8-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 = [
@@ -122251,14 +125642,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -122341,14 +125732,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_ppc64_standalone") {
++  source_set("qu8-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 = [
@@ -122418,14 +125809,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -122508,14 +125899,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_ppc64_standalone") {
++  source_set("qu8-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 = [
@@ -122585,14 +125976,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -122673,14 +126064,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_ppc64_standalone") {
++  source_set("qu8-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 = [
@@ -122748,14 +126139,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -122836,14 +126227,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_ppc64_standalone") {
++  source_set("qu8-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 = [
@@ -122911,14 +126302,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -122999,14 +126390,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_ppc64_standalone") {
++  source_set("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 = [
@@ -123076,16 +126467,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -123166,16 +126555,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("reference_ppc64_standalone") {
++  source_set("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 = [
@@ -123245,14 +126632,16 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -123333,14 +126722,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_ppc64_standalone") {
++  source_set("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 = [
@@ -123408,14 +126799,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -123496,14 +126887,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_ppc64_standalone") {
++  source_set("s8-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 = [
@@ -123571,15 +126962,14 @@ Index: chromium-148.0.7778.96/third_party/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) {
@@ -123660,15 +127050,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_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 = [
@@ -123736,16 +127125,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -123826,16 +127214,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_ppc64_standalone") {
++  source_set("s8-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"
 +    ]
  
 -      sources = [
@@ -123878,14 +127265,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vmulc_riscv64_standalone") {
 -      cflags = []
 +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"
 +    ]
  
 -      sources = [
@@ -123941,14 +127330,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_ppc64_standalone") {
++  source_set("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"
 +    ]
  
 -      deps = [
@@ -124027,42 +127418,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -124116,42 +127479,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_ppc64_standalone") {
++  source_set("s8-vclamp_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/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 = [
@@ -124194,22 +127529,42 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vrpreluc_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("tables_ppc64") {
++  source_set("subgraph_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/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 = [
@@ -124267,22 +127622,42 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_ppc64_standalone") {
++  source_set("subgraph_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/rope.c",
++    "src/src/subgraph/softmax.c",
++    "src/src/subgraph/space-to-depth-2d.c",
++    "src/src/subgraph/static-constant-pad.c",
++    "src/src/subgraph/static-reduce.c",
++    "src/src/subgraph/static-resize-bilinear-2d.c",
++    "src/src/subgraph/static-slice.c",
++    "src/src/subgraph/static-transpose.c",
++    "src/src/subgraph/subgraph-utils.c",
++    "src/src/subgraph/unary.c",
++    "src/src/subgraph/unpooling-2d.c",
++    "src/src/subgraph/validation.c"
 +    ]
  
 -      deps = [
@@ -124363,14 +127738,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_ppc64") {
++  source_set("tables_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -124424,14 +127807,22 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_ppc64_standalone") {
++  source_set("tables_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
 +    ]
  
 -      sources = [
@@ -124499,14 +127890,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_ppc64") {
++  source_set("u8-ibilinear_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -124589,14 +127980,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_ppc64_standalone") {
++  source_set("u8-ibilinear_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -124666,14 +128057,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_ppc64") {
++  source_set("u8-lut32norm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -124758,14 +128149,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_ppc64_standalone") {
++  source_set("u8-lut32norm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      sources = [
@@ -124837,15 +128228,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_ppc64") {
++  source_set("u8-maxpool_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -124926,15 +128316,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_ppc64_standalone") {
++  source_set("u8-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"
 +    ]
  
 -      sources = [
@@ -125002,16 +128391,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_ppc64") {
++  source_set("u8-rdminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -125085,16 +128473,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_ppc64_standalone") {
++  source_set("u8-rdminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -125202,14 +128589,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("tables_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_ppc64") {
++  source_set("u8-rminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -125273,14 +128662,16 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_ppc64_standalone") {
++  source_set("u8-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      deps = [
@@ -125359,14 +128750,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x16-transposec_ppc64") {
++  source_set("u8-vclamp_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -125420,14 +128811,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_ppc64_standalone") {
++  source_set("u8-vclamp_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -125495,15 +128886,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_ppc64") {
++  source_set("x16-transposec_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -125586,15 +128976,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-x32-packw_ppc64_standalone") {
++  source_set("x16-transposec_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -125664,14 +129053,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x24-transposec_ppc64") {
++  source_set("x16-x32-packw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -125756,14 +129146,15 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_ppc64_standalone") {
++  source_set("x16-x32-packw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
@@ -125835,19 +129226,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x32-packw_ppc64") {
++  source_set("x24-transposec_ppc64") {
 +    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/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -125928,19 +129314,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_ppc64_standalone") {
++  source_set("x24-transposec_ppc64_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/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
  
 -      sources = [
@@ -125983,14 +129364,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("u8-vclamp_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x32-transposec_ppc64") {
++  source_set("x32-packw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c"
 +    ]
  
 -      sources = [
@@ -126046,14 +129432,19 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_ppc64_standalone") {
++  source_set("x32-packw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c"
 +    ]
  
 -      deps = [
@@ -126133,14 +129524,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x32-unpool_ppc64") {
++  source_set("x32-transposec_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -126195,14 +129586,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_ppc64_standalone") {
++  source_set("x32-transposec_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -126270,14 +129661,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x64-transposec_ppc64") {
++  source_set("x32-unpool_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -126358,14 +129749,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_ppc64_standalone") {
++  source_set("x32-unpool_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
 -      sources = [
@@ -126470,14 +129861,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x8-lut_ppc64") {
++  source_set("x64-transposec_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -126538,14 +129929,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_ppc64_standalone") {
++  source_set("x64-transposec_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -126588,14 +129979,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x32-transposec_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-packq_ppc64") {
++  source_set("x8-lut_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -126651,14 +130042,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_ppc64_standalone") {
++  source_set("x8-lut_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -126737,17 +130128,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x8-packw_ppc64") {
++  source_set("x8-packq_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -126801,17 +130189,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packw_ppc64_standalone") {
++  source_set("x8-packq_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      sources = [
@@ -126854,14 +130239,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x8-lut_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-transposec_ppc64") {
++  source_set("x8-packw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-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 = [
@@ -126917,14 +130305,17 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_ppc64_standalone") {
++  source_set("x8-packw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-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"
 +    ]
  
 -      deps = [
@@ -127006,14 +130397,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("xx-copy_ppc64") {
++  source_set("x8-transposec_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -127070,14 +130461,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_ppc64_standalone") {
++  source_set("x8-transposec_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -127120,14 +130511,14 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -    source_set("x8-transposec_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("xx-fill_ppc64") {
++  source_set("xx-copy_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      sources = [
@@ -127153,60 +130544,50 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("xx-copy_riscv64") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/xx-copy/xx-copy-scalar-memcpy.c",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("xx-copy_riscv64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_ppc64_standalone") {
++  source_set("xx-copy_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
--      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",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    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",
@@ -127214,11 +130595,35 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("xx-copy_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("xx-fill_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -127242,32 +130647,77 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("xx-fill_riscv64") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("xx-fill_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/xx-fill/xx-fill-scalar-u16.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("xx-fill_riscv64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("xx-pad_ppc64") {
 +    cflags = [
@@ -127279,25 +130729,6 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 +      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("xx-fill_riscv64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/xx-fill/xx-fill-scalar-u16.c",
@@ -127321,6 +130752,18 @@ Index: chromium-148.0.7778.96/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}

diff --git a/0002-third_party-libvpx-Remove-bad-ppc64-config.patch b/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
index 36a72d6..ca43d3f 100644
--- a/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
+++ b/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
@@ -1,6 +1,7 @@
-Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
-===================================================================
---- chromium-147.0.7727.49.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
+diff --git a/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h b/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
+deleted file mode 100644
+index 4b367b1..0000000
+--- a/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
 +++ /dev/null
 @@ -1,186 +0,0 @@
 -/*
@@ -189,11 +190,12 @@ Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vp8_r
 -#endif
 -
 -#endif  // VP8_RTCD_H_
-Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
-===================================================================
---- chromium-147.0.7727.49.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
+diff --git a/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h b/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
+deleted file mode 100644
+index b3ab12b..0000000
+--- a/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
 +++ /dev/null
-@@ -1,119 +0,0 @@
+@@ -1,113 +0,0 @@
 -/*
 - *  Copyright (c) 2017 The WebM project authors. All Rights Reserved.
 - *
@@ -263,12 +265,6 @@ Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vp9_r
 -void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
 -#define vp9_fht8x8 vp9_fht8x8_c
 -
--void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int src_weight);
--#define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c
--
--void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int src_weight);
--#define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c
--
 -void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
 -#define vp9_fwht4x4 vp9_fwht4x4_c
 -
@@ -313,9 +309,10 @@ Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vp9_r
 -#endif
 -
 -#endif  // VP9_RTCD_H_
-Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
-===================================================================
---- chromium-147.0.7727.49.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
+diff --git a/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm b/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
+deleted file mode 100644
+index f55178d..0000000
+--- a/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
 +++ /dev/null
 @@ -1,109 +0,0 @@
 -@ This file was created from a .asm file
@@ -383,7 +380,7 @@ Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -.equ CONFIG_DC_RECON ,  0
 -.equ CONFIG_RUNTIME_CPU_DETECT ,  0
 -.equ CONFIG_POSTPROC ,  1
--.equ CONFIG_VP9_POSTPROC ,  1
+-.equ CONFIG_VP9_POSTPROC ,  0
 -.equ CONFIG_MULTITHREAD ,  1
 -.equ CONFIG_INTERNAL_STATS ,  0
 -.equ CONFIG_VP8_ENCODER ,  1
@@ -427,9 +424,10 @@ Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -.equ DECODE_WIDTH_LIMIT ,  16384
 -.equ DECODE_HEIGHT_LIMIT ,  16384
 -    .section .note.GNU-stack,"",%progbits
-Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
-===================================================================
---- chromium-147.0.7727.49.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
+diff --git a/third_party/libvpx/source/config/linux/ppc64/vpx_config.c b/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
+deleted file mode 100644
+index 46ff848..0000000
+--- a/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
 +++ /dev/null
 @@ -1,10 +0,0 @@
 -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
@@ -440,11 +438,12 @@ Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -/* in the file PATENTS.  All contributing project authors may */
 -/* be found in the AUTHORS file in the root of the source tree. */
 -#include "vpx/vpx_codec.h"
--static const char* const cfg = "--target=ppc64le-linux-gcc --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv --enable-unit-tests";
+-static const char* const cfg = "--target=ppc64le-linux-gcc --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --disable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv --enable-unit-tests";
 -const char *vpx_codec_build_config(void) {return cfg;}
-Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
-===================================================================
---- chromium-147.0.7727.49.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
+diff --git a/third_party/libvpx/source/config/linux/ppc64/vpx_config.h b/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
+deleted file mode 100644
+index fa31289..0000000
+--- a/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
 +++ /dev/null
 @@ -1,118 +0,0 @@
 -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
@@ -521,7 +520,7 @@ Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -#define CONFIG_DC_RECON 0
 -#define CONFIG_RUNTIME_CPU_DETECT 0
 -#define CONFIG_POSTPROC 1
--#define CONFIG_VP9_POSTPROC 1
+-#define CONFIG_VP9_POSTPROC 0
 -#define CONFIG_MULTITHREAD 1
 -#define CONFIG_INTERNAL_STATS 0
 -#define CONFIG_VP8_ENCODER 1
@@ -565,9 +564,10 @@ Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -#define DECODE_WIDTH_LIMIT 16384
 -#define DECODE_HEIGHT_LIMIT 16384
 -#endif /* VPX_CONFIG_H */
-Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
-===================================================================
---- chromium-147.0.7727.49.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
+diff --git a/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
+deleted file mode 100644
+index d325dbd..0000000
+--- a/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
 +++ /dev/null
 @@ -1,858 +0,0 @@
 -/*
@@ -1428,9 +1428,10 @@ Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_d
 -#endif
 -
 -#endif  // VPX_DSP_RTCD_H_
-Index: chromium-147.0.7727.49/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
-===================================================================
---- chromium-147.0.7727.49.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
+diff --git a/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
+deleted file mode 100644
+index b01ed62..0000000
+--- a/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
 +++ /dev/null
 @@ -1,83 +0,0 @@
 -/*

diff --git a/0003-third_party-libvpx-Add-ppc64-generated-config.patch b/0003-third_party-libvpx-Add-ppc64-generated-config.patch
index e329359..b4cdb6b 100644
--- a/0003-third_party-libvpx-Add-ppc64-generated-config.patch
+++ b/0003-third_party-libvpx-Add-ppc64-generated-config.patch
@@ -1,8 +1,24 @@
-Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
+commit 50e76d04c69447701ea1bcea8e77b72d0b8b4489
+Author: Timothy Pearson <tpearson@raptorengineering.com>
+Date:   Thu Jun 4 08:04:34 2026 -0500
+
+    woinewf
+
+Index: chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
-@@ -0,0 +1,316 @@
++++ chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
+@@ -0,0 +1,330 @@
++/*
++ *  Copyright (c) 2017 The WebM project authors. All Rights Reserved.
++ *
++ *  Use of this source code is governed by a BSD-style license
++ *  that can be found in the LICENSE file in the root of the source
++ *  tree. An additional intellectual property rights grant can be found
++ *  in the file PATENTS.  All contributing project authors may
++ *  be found in the AUTHORS file in the root of the source tree.
++ */
++
 +// This file is generated. Do not edit.
 +#ifndef VP8_RTCD_H_
 +#define VP8_RTCD_H_
@@ -311,19 +327,33 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_r
 +#include "vpx_config.h"
 +
 +#ifdef RTCD_C
-+static void setup_rtcd_internal(void) {}
++#include "vpx_ports/ppc.h"
++static void setup_rtcd_internal(void) {
++  int flags = ppc_simd_caps();
++  (void)flags;
++}
 +#endif
 +
 +#ifdef __cplusplus
 +}  // extern "C"
 +#endif
 +
-+#endif
-Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
++#endif  // VP8_RTCD_H_
+Index: chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
-@@ -0,0 +1,267 @@
++++ chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
+@@ -0,0 +1,246 @@
++/*
++ *  Copyright (c) 2017 The WebM project authors. All Rights Reserved.
++ *
++ *  Use of this source code is governed by a BSD-style license
++ *  that can be found in the LICENSE file in the root of the source
++ *  tree. An additional intellectual property rights grant can be found
++ *  in the file PATENTS.  All contributing project authors may
++ *  be found in the AUTHORS file in the root of the source tree.
++ */
++
 +// This file is generated. Do not edit.
 +#ifndef VP9_RTCD_H_
 +#define VP9_RTCD_H_
@@ -342,6 +372,9 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_r
 +#include "vp9/common/vp9_enums.h"
 +#include "vp9/common/vp9_filter.h"
 +#include "vpx/vpx_integer.h"
++#if !CONFIG_REALTIME_ONLY && CONFIG_VP9_ENCODER
++#include "vp9/encoder/vp9_temporal_filter.h"
++#endif
 +
 +struct macroblockd;
 +
@@ -411,20 +444,6 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_r
 +                  int tx_type);
 +#define vp9_fht8x8 vp9_fht8x8_c
 +
-+void vp9_filter_by_weight16x16_c(const uint8_t* src,
-+                                 int src_stride,
-+                                 uint8_t* dst,
-+                                 int dst_stride,
-+                                 int src_weight);
-+#define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c
-+
-+void vp9_filter_by_weight8x8_c(const uint8_t* src,
-+                               int src_stride,
-+                               uint8_t* dst,
-+                               int dst_stride,
-+                               int src_weight);
-+#define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c
-+
 +void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 +#define vp9_fwht4x4 vp9_fwht4x4_c
 +
@@ -477,30 +496,6 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_r
 +                                int bd);
 +#define vp9_highbd_iht8x8_64_add vp9_highbd_iht8x8_64_add_c
 +
-+void vp9_highbd_mbpost_proc_across_ip_c(uint16_t* src,
-+                                        int pitch,
-+                                        int rows,
-+                                        int cols,
-+                                        int flimit);
-+#define vp9_highbd_mbpost_proc_across_ip vp9_highbd_mbpost_proc_across_ip_c
-+
-+void vp9_highbd_mbpost_proc_down_c(uint16_t* dst,
-+                                   int pitch,
-+                                   int rows,
-+                                   int cols,
-+                                   int flimit);
-+#define vp9_highbd_mbpost_proc_down vp9_highbd_mbpost_proc_down_c
-+
-+void vp9_highbd_post_proc_down_and_across_c(const uint16_t* src_ptr,
-+                                            uint16_t* dst_ptr,
-+                                            int src_pixels_per_line,
-+                                            int dst_pixels_per_line,
-+                                            int rows,
-+                                            int cols,
-+                                            int flimit);
-+#define vp9_highbd_post_proc_down_and_across \
-+  vp9_highbd_post_proc_down_and_across_c
-+
 +void vp9_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
 +                              intptr_t n_coeffs,
 +                              const struct macroblock_plane* const mb_plane,
@@ -583,19 +578,23 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_r
 +#include "vpx_config.h"
 +
 +#ifdef RTCD_C
-+static void setup_rtcd_internal(void) {}
++#include "vpx_ports/ppc.h"
++static void setup_rtcd_internal(void) {
++  int flags = ppc_simd_caps();
++  (void)flags;
++}
 +#endif
 +
 +#ifdef __cplusplus
 +}  // extern "C"
 +#endif
 +
-+#endif
-Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
++#endif  // VP9_RTCD_H_
+Index: chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
 ===================================================================
 --- /dev/null
-+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
-@@ -0,0 +1,107 @@
++++ chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
+@@ -0,0 +1,109 @@
 +@ This file was created from a .asm file
 +@  using the ads2gas.pl script.
 +.syntax unified
@@ -618,10 +617,12 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +.equ HAVE_NEON_DOTPROD ,  0
 +.equ HAVE_NEON_I8MM ,  0
 +.equ HAVE_SVE ,  0
++.equ HAVE_SVE2 ,  0
 +.equ HAVE_MIPS32 ,  0
 +.equ HAVE_DSPR2 ,  0
 +.equ HAVE_MSA ,  0
 +.equ HAVE_MIPS64 ,  0
++.equ HAVE_X86_ASM ,  0
 +.equ HAVE_MMX ,  0
 +.equ HAVE_SSE ,  0
 +.equ HAVE_SSE2 ,  0
@@ -637,6 +638,7 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +.equ HAVE_LASX ,  0
 +.equ HAVE_VPX_PORTS ,  1
 +.equ HAVE_PTHREAD_H ,  1
++.equ HAVE_PTHREAD_SETNAME_NP ,  1
 +.equ HAVE_UNISTD_H ,  0
 +.equ CONFIG_DEPENDENCY_TRACKING ,  1
 +.equ CONFIG_EXTERNAL_BUILD ,  1
@@ -658,7 +660,7 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +.equ CONFIG_DC_RECON ,  0
 +.equ CONFIG_RUNTIME_CPU_DETECT ,  0
 +.equ CONFIG_POSTPROC ,  1
-+.equ CONFIG_VP9_POSTPROC ,  1
++.equ CONFIG_VP9_POSTPROC ,  0
 +.equ CONFIG_MULTITHREAD ,  1
 +.equ CONFIG_INTERNAL_STATS ,  0
 +.equ CONFIG_VP8_ENCODER ,  1
@@ -698,15 +700,14 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +.equ CONFIG_FP_MB_STATS ,  0
 +.equ CONFIG_EMULATE_HARDWARE ,  0
 +.equ CONFIG_NON_GREEDY_MV ,  0
-+.equ CONFIG_RATE_CTRL ,  0
 +.equ CONFIG_COLLECT_COMPONENT_TIMING ,  0
 +.equ DECODE_WIDTH_LIMIT ,  16384
 +.equ DECODE_HEIGHT_LIMIT ,  16384
 +    .section .note.GNU-stack,"",%progbits
-Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
+Index: chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
 ===================================================================
 --- /dev/null
-+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
++++ chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
 @@ -0,0 +1,10 @@
 +/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 +/*  */
@@ -716,13 +717,13 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +/* in the file PATENTS.  All contributing project authors may */
 +/* be found in the AUTHORS file in the root of the source tree. */
 +#include "vpx/vpx_codec.h"
-+static const char* const cfg = "--target=generic-gnu --enable-vp9-highbitdepth --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv";
++static const char* const cfg = "--target=generic-gnu --enable-vp9-highbitdepth --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --disable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv --enable-unit-tests --disable-vsx";
 +const char *vpx_codec_build_config(void) {return cfg;}
-Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
+Index: chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
 ===================================================================
 --- /dev/null
-+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
-@@ -0,0 +1,116 @@
++++ chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
+@@ -0,0 +1,118 @@
 +/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 +/*  */
 +/* Use of this source code is governed by a BSD-style license */
@@ -754,10 +755,12 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +#define HAVE_NEON_DOTPROD 0
 +#define HAVE_NEON_I8MM 0
 +#define HAVE_SVE 0
++#define HAVE_SVE2 0
 +#define HAVE_MIPS32 0
 +#define HAVE_DSPR2 0
 +#define HAVE_MSA 0
 +#define HAVE_MIPS64 0
++#define HAVE_X86_ASM 0
 +#define HAVE_MMX 0
 +#define HAVE_SSE 0
 +#define HAVE_SSE2 0
@@ -773,6 +776,7 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +#define HAVE_LASX 0
 +#define HAVE_VPX_PORTS 1
 +#define HAVE_PTHREAD_H 1
++#define HAVE_PTHREAD_SETNAME_NP 1
 +#define HAVE_UNISTD_H 0
 +#define CONFIG_DEPENDENCY_TRACKING 1
 +#define CONFIG_EXTERNAL_BUILD 1
@@ -794,7 +798,7 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +#define CONFIG_DC_RECON 0
 +#define CONFIG_RUNTIME_CPU_DETECT 0
 +#define CONFIG_POSTPROC 1
-+#define CONFIG_VP9_POSTPROC 1
++#define CONFIG_VP9_POSTPROC 0
 +#define CONFIG_MULTITHREAD 1
 +#define CONFIG_INTERNAL_STATS 0
 +#define CONFIG_VP8_ENCODER 1
@@ -834,16 +838,25 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +#define CONFIG_FP_MB_STATS 0
 +#define CONFIG_EMULATE_HARDWARE 0
 +#define CONFIG_NON_GREEDY_MV 0
-+#define CONFIG_RATE_CTRL 0
 +#define CONFIG_COLLECT_COMPONENT_TIMING 0
 +#define DECODE_WIDTH_LIMIT 16384
 +#define DECODE_HEIGHT_LIMIT 16384
 +#endif /* VPX_CONFIG_H */
-Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
+Index: chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
-@@ -0,0 +1,4128 @@
++++ chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
+@@ -0,0 +1,4142 @@
++/*
++ *  Copyright (c) 2017 The WebM project authors. All Rights Reserved.
++ *
++ *  Use of this source code is governed by a BSD-style license
++ *  that can be found in the LICENSE file in the root of the source
++ *  tree. An additional intellectual property rights grant can be found
++ *  in the file PATENTS.  All contributing project authors may
++ *  be found in the AUTHORS file in the root of the source tree.
++ */
++
 +// This file is generated. Do not edit.
 +#ifndef VPX_DSP_RTCD_H_
 +#define VPX_DSP_RTCD_H_
@@ -4543,10 +4556,10 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_d
 +                       int h);
 +#define vpx_scaled_vert vpx_scaled_vert_c
 +
-+int64_t vpx_sse_c(const uint8_t* a,
-+                  int a_stride,
-+                  const uint8_t* b,
-+                  int b_stride,
++int64_t vpx_sse_c(const uint8_t* src,
++                  int src_stride,
++                  const uint8_t* ref,
++                  int ref_stride,
 +                  int width,
 +                  int height);
 +#define vpx_sse vpx_sse_c
@@ -4964,19 +4977,33 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_d
 +#include "vpx_config.h"
 +
 +#ifdef RTCD_C
-+static void setup_rtcd_internal(void) {}
++#include "vpx_ports/ppc.h"
++static void setup_rtcd_internal(void) {
++  int flags = ppc_simd_caps();
++  (void)flags;
++}
 +#endif
 +
 +#ifdef __cplusplus
 +}  // extern "C"
 +#endif
 +
-+#endif
-Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
++#endif  // VPX_DSP_RTCD_H_
+Index: chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
-@@ -0,0 +1,96 @@
++++ chromium-149.0.7827.53/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
+@@ -0,0 +1,110 @@
++/*
++ *  Copyright (c) 2017 The WebM project authors. All Rights Reserved.
++ *
++ *  Use of this source code is governed by a BSD-style license
++ *  that can be found in the LICENSE file in the root of the source
++ *  tree. An additional intellectual property rights grant can be found
++ *  in the file PATENTS.  All contributing project authors may
++ *  be found in the AUTHORS file in the root of the source tree.
++ */
++
 +// This file is generated. Do not edit.
 +#ifndef VPX_SCALE_RTCD_H_
 +#define VPX_SCALE_RTCD_H_
@@ -5065,11 +5092,15 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_s
 +#include "vpx_config.h"
 +
 +#ifdef RTCD_C
-+static void setup_rtcd_internal(void) {}
++#include "vpx_ports/ppc.h"
++static void setup_rtcd_internal(void) {
++  int flags = ppc_simd_caps();
++  (void)flags;
++}
 +#endif
 +
 +#ifdef __cplusplus
 +}  // extern "C"
 +#endif
 +
-+#endif
++#endif  // VPX_SCALE_RTCD_H_

diff --git a/0005-blink-add-audio-vector-support.patch b/0005-blink-add-audio-vector-support.patch
new file mode 100644
index 0000000..6fb50e6
--- /dev/null
+++ b/0005-blink-add-audio-vector-support.patch
@@ -0,0 +1,211 @@
+--- a/third_party/blink/renderer/platform/audio/cpu/ppc64/delay_altivec.cc
++++ b/third_party/blink/renderer/platform/audio/cpu/ppc64/delay_altivec.cc
+@@ -0,0 +1,183 @@
++// Copyright 2016 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// Enable SSE translation layer
++#define NO_WARN_X86_INTRINSICS
++
++#include "third_party/blink/renderer/platform/audio/delay.h"
++
++#include <xmmintrin.h>
++#include <emmintrin.h>
++
++#include <array>
++
++#include "base/compiler_specific.h"
++
++namespace blink {
++
++ALWAYS_INLINE static __m128i WrapIndexVector(__m128i v_write_index,
++                                             __m128i v_buffer_length) {
++  // Wrap the write_index if any index is past the end of the buffer.
++  // This implements
++  //
++  //   if (write_index >= buffer_length)
++  //     write_index -= buffer_length
++
++  // There's no mm_cmpge_epi32, so we need to use mm_cmplt_epi32.  Thus, the
++  // above becomes
++  //
++  //   if (!(write_index < buffer_length))
++  //     write_index -= buffer_length
++
++  // If write_index < buffer_length, set cmp = 0xffffffff.  Otherwise 0.
++  __m128i cmp = _mm_cmplt_epi32(v_write_index, v_buffer_length);
++
++  // Invert cmp and bitwise-and with buffer_length to get buffer_length or 0
++  // depending on whether write_index >= buffer_length or not.  Subtract from
++  // write_index to wrap it.
++  return _mm_sub_epi32(v_write_index, _mm_andnot_si128(cmp, v_buffer_length));
++}
++
++ALWAYS_INLINE static __m128 WrapPositionVector(__m128 v_position,
++                                               __m128 v_buffer_length) {
++  // Wrap the read position if it exceed the buffer length.
++  // This implements
++  //
++  //   if (position >= buffer_length)
++  //     read_position -= buffer_length
++
++  // If position >= buffer length, set cmp = 0xffffffff.  Otherwise 0.
++  __m128 cmp = _mm_cmpge_ps(v_position, v_buffer_length);
++
++  // Bitwise-and buffer_length with cmp to get buffer_length or 0 depending on
++  // whether read_position >= buffer length or not.  Then subtract from the
++  // position to wrap it.
++  return _mm_sub_ps(v_position, _mm_and_ps(v_buffer_length, cmp));
++}
++
++std::tuple<size_t, size_t> Delay::ProcessARateVector(
++    base::span<float> destination,
++    size_t frames_to_process) const {
++  const size_t buffer_length = buffer_.size();
++
++  const float sample_rate = sample_rate_;
++  size_t w_index = write_index_;
++
++  const __m128 v_sample_rate = _mm_set1_ps(sample_rate);
++  const __m128 v_all_zeros = _mm_setzero_ps();
++
++  // The buffer length as a float and as an int so we don't need to constant
++  // convert from one to the other.
++  const __m128 v_buffer_length_float = _mm_set1_ps(buffer_length);
++  const __m128i v_buffer_length_int = _mm_set1_epi32(buffer_length);
++
++  // How much to increment the write index each time through the loop.
++  const __m128i v_incr = _mm_set1_epi32(4);
++
++  // Temp arrays for storing the samples needed for interpolation
++  std::array<float, 4> sample1 __attribute((aligned(16)));
++  std::array<float, 4> sample2 __attribute((aligned(16)));
++
++  // Initialize the write index vector, and  wrap the values if needed.
++  __m128i v_write_index =
++      _mm_set_epi32(w_index + 3, w_index + 2, w_index + 1, w_index + 0);
++  v_write_index = WrapIndexVector(v_write_index, v_buffer_length_int);
++
++  const size_t number_of_loops = frames_to_process / 4;
++  size_t k = 0;
++
++  for (size_t n = 0; n < number_of_loops; ++n, k += 4) {
++    // It's possible that `delay_time` contains negative values. Make sure
++    // they are greater than zero.
++    const __m128 v_delay_time =
++        _mm_max_ps(_mm_loadu_ps(delay_times_.as_span().subspan(k, 4u).data()),
++                   v_all_zeros);
++    const __m128 v_desired_delay_frames =
++        _mm_mul_ps(v_delay_time, v_sample_rate);
++
++    // read_position = write_index + buffer_length - desired_delay_frames.  Wrap
++    // the position if needed.
++    __m128 v_read_position =
++        _mm_add_ps(_mm_cvtepi32_ps(v_write_index),
++                   _mm_sub_ps(v_buffer_length_float, v_desired_delay_frames));
++    v_read_position =
++        WrapPositionVector(v_read_position, v_buffer_length_float);
++
++    // Get indices into the buffer for the samples we need for interpolation.
++    const __m128i v_read_index1 = WrapIndexVector(
++        _mm_cvttps_epi32(v_read_position), v_buffer_length_int);
++    const __m128i v_read_index2 = WrapIndexVector(
++        _mm_add_epi32(v_read_index1, _mm_set1_epi32(1)), v_buffer_length_int);
++
++    const __m128 interpolation_factor =
++        _mm_sub_ps(v_read_position, _mm_cvtepi32_ps(v_read_index1));
++
++    const uint32_t* read_index1 =
++        reinterpret_cast<const uint32_t*>(&v_read_index1);
++    const uint32_t* read_index2 =
++        reinterpret_cast<const uint32_t*>(&v_read_index2);
++
++    for (int m = 0; m < 4; ++m) {
++      sample1[m] = buffer_[UNSAFE_TODO(read_index1[m])];
++      sample2[m] = buffer_[UNSAFE_TODO(read_index2[m])];
++    }
++
++    const __m128 v_sample1 = _mm_load_ps(sample1.data());
++    const __m128 v_sample2 = _mm_load_ps(sample2.data());
++
++    v_write_index = _mm_add_epi32(v_write_index, v_incr);
++    v_write_index = WrapIndexVector(v_write_index, v_buffer_length_int);
++
++    const __m128 sample = _mm_add_ps(
++        v_sample1,
++        _mm_mul_ps(interpolation_factor, _mm_sub_ps(v_sample2, v_sample1)));
++    _mm_store_ps(destination.subspan(k, 4u).data(), sample);
++  }
++
++  // Update |w_index|_ based on how many frames we processed here, wrapping
++  // around if needed.
++  w_index = write_index_ + k;
++  if (w_index >= buffer_length) {
++    w_index -= buffer_length;
++  }
++
++  return std::make_tuple(k, w_index);
++}
++
++void Delay::HandleNaN(base::span<float> delay_times,
++                      size_t frames_to_process,
++                      float max_time) {
++  unsigned k = 0;
++  const unsigned number_of_loops = frames_to_process / 4;
++
++  __m128 v_max_time = _mm_set1_ps(max_time);
++
++  // This is approximately 4 times faster than the scalar version.
++  for (unsigned loop = 0; loop < number_of_loops; ++loop, k += 4) {
++    __m128 x = _mm_loadu_ps(delay_times.subspan(k, 4u).data());
++    // 0xffffffff if x is NaN. Otherwise 0
++    __m128 cmp = _mm_cmpunord_ps(x, x);
++
++    // Use cmp as a mask to set a component of x to 0 if is NaN.  Otherwise,
++    // preserve x.
++    x = _mm_andnot_ps(cmp, x);
++
++    // Now set cmp to be max_time if the value is 0xffffffff or 0.
++    cmp = _mm_and_ps(cmp, v_max_time);
++
++    // Merge i (bitwise or) x and cmp.  This makes x = max_time if x was NaN and
++    // preserves x if not.
++    x = _mm_or_ps(x, cmp);
++    _mm_storeu_ps(delay_times.subspan(k, 4u).data(), x);
++  }
++
++  // Handle any frames not done in the loop above.
++  for (; k < frames_to_process; ++k) {
++    if (std::isnan(delay_times[k])) {
++      delay_times[k] = max_time;
++    }
++  }
++}
++
++}  // namespace blink
+--- a/third_party/blink/renderer/platform/audio/delay.cc
++++ b/third_party/blink/renderer/platform/audio/delay.cc
+@@ -99,7 +99,7 @@
+   return desired_delay_frames_ / sample_rate;
+ }
+ 
+-#if !(defined(ARCH_CPU_X86_FAMILY) || defined(CPU_ARM_NEON))
++#if !(defined(ARCH_CPU_X86_FAMILY) || defined(CPU_ARM_NEON) || defined(ARCH_CPU_PPC64_FAMILY))
+ // Default scalar versions if simd/neon are not available.
+ std::tuple<size_t, size_t> Delay::ProcessARateVector(
+     base::span<float> destination,
+diff -urN a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
+--- a/third_party/blink/renderer/platform/BUILD.gn
++++ b/third_party/blink/renderer/platform/BUILD.gn
+@@ -1962,6 +1962,10 @@
+     sources += [ "audio/cpu/arm/delay_neon.cc" ]
+   }
+ 
++  if (current_cpu == "ppc64") {
++    sources += [ "audio/cpu/ppc64/delay_altivec.cc" ]
++  }
++
+   if (!is_mac) {
+     include_dirs += [ "//third_party/pffft/src" ]
+     deps += [ "//third_party/pffft" ]

diff --git a/chromium-141-glibc-2.42-SYS_SECCOMP.patch b/chromium-141-glibc-2.42-SYS_SECCOMP.patch
deleted file mode 100644
index 0288cb2..0000000
--- a/chromium-141-glibc-2.42-SYS_SECCOMP.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix FTBFS
-
-/usr/include/bits/siginfo-consts.h:219:3: error: expected identifier
-  219 |   SYS_SECCOMP = 1,              /* Seccomp triggered.  */
-      |   ^
-../../sandbox/linux/system_headers/linux_seccomp.h:220:39: note: expanded from macro 'SYS_SECCOMP'
-  220 | #define SYS_SECCOMP                   1
-      |                                       ^
-../../sandbox/linux/seccomp-bpf/trap.cc:159:46: error: use of undeclared identifier 'SYS_SECCOMP'
-  159 |   if (nr != LINUX_SIGSYS || info->si_code != SYS_SECCOMP || !ctx ||
-      |                                              ^~~~~~~~~~~
-/usr/include/bits/siginfo-consts.h:220:23: note: expanded from macro 'SYS_SECCOMP'
-  220 | #  define SYS_SECCOMP   SYS_SECCOMP
-
-diff -up chromium-141.0.7390.122/sandbox/linux/system_headers/linux_seccomp.h.me chromium-141.0.7390.122/sandbox/linux/system_headers/linux_seccomp.h
---- chromium-141.0.7390.122/sandbox/linux/system_headers/linux_seccomp.h.me	2025-10-28 10:05:44.970248151 +0100
-+++ chromium-141.0.7390.122/sandbox/linux/system_headers/linux_seccomp.h	2025-10-28 10:05:52.291345772 +0100
-@@ -214,8 +214,11 @@ struct seccomp_notif_addfd {
- #define SECCOMP_RET_INVALID 0x00010000U  // Illegal return value
- #endif
- 
-+// check glibc version < 2.42
-+#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 42)
- #ifndef SYS_SECCOMP
- #define SYS_SECCOMP                   1
- #endif
-+#endif
- 
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SECCOMP_H_

diff --git a/chromium-146-clang-unknown-argument.patch b/chromium-146-clang-unknown-argument.patch
deleted file mode 100644
index 318111d..0000000
--- a/chromium-146-clang-unknown-argument.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix FTBFS with llvm < 22
-lang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=array-bounds'
-
-diff -up chromium-146.0.7680.65/build/config/compiler/BUILD.gn.than chromium-146.0.7680.65/build/config/compiler/BUILD.gn
---- chromium-146.0.7680.65/build/config/compiler/BUILD.gn.than	2026-03-09 11:10:29.942718861 +0100
-+++ chromium-146.0.7680.65/build/config/compiler/BUILD.gn	2026-03-09 11:11:28.703554766 +0100
-@@ -1855,18 +1855,6 @@ config("sanitize_c_array_bounds") {
-     cflags = [
-       "-fsanitize=array-bounds",
-       "-fsanitize-trap=array-bounds",
--
--      # Some code users feature detection to determine if UBSAN (or any
--      # sanitizer) is enabled, they then do expensive debug like operations. We
--      # want to suppress this behaviour since we want to keep performance costs
--      # as low as possible while having these checks.
--      "-fsanitize-ignore-for-ubsan-feature=array-bounds",
--
--      # Because we've enabled array-bounds sanitizing we also want to suppress
--      # the related warning about "unsafe-buffer-usage-in-static-sized-array",
--      # since we know that the array bounds sanitizing will catch any out-of-
--      # bounds accesses.
--      "-Wno-unsafe-buffer-usage-in-static-sized-array",
-     ]
-   }
- }

diff --git a/chromium-147-widevine-on-arm64.patch b/chromium-147-widevine-on-arm64.patch
deleted file mode 100644
index d603cbc..0000000
--- a/chromium-147-widevine-on-arm64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Enable widevine_cdm on arm64
-
-diff -up chromium-147.0.7727.137/third_party/widevine/cdm/widevine.gni.me chromium-147.0.7727.137/third_party/widevine/cdm/widevine.gni
---- chromium-147.0.7727.137/third_party/widevine/cdm/widevine.gni.me	2026-04-29 18:40:15.060405982 +0200
-+++ chromium-147.0.7727.137/third_party/widevine/cdm/widevine.gni	2026-04-29 18:42:07.060690905 +0200
-@@ -27,7 +27,8 @@ if (is_chromeos && !is_chromeos_device)
- library_widevine_cdm_available =
-     (is_chromeos &&
-      (target_cpu == "x64" || target_cpu == "arm" || target_cpu == "arm64")) ||
--    (target_os == "linux" && target_cpu == "x64") ||
-+    (target_os == "linux" &&
-+     (target_cpu == "x64" || target_cpu == "arm64")) ||
-     (target_os == "mac" && (target_cpu == "x64" || target_cpu == "arm64")) ||
-     (target_os == "win" &&
-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64"))

diff --git a/chromium-148-clang++-unknown-argument.patch b/chromium-148-clang++-unknown-argument.patch
deleted file mode 100644
index aaa2106..0000000
--- a/chromium-148-clang++-unknown-argument.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up chromium-148.0.7778.96/build/config/compiler/BUILD.gn.me chromium-148.0.7778.96/build/config/compiler/BUILD.gn
---- chromium-148.0.7778.96/build/config/compiler/BUILD.gn.me	2026-05-05 17:00:41.925065232 +0200
-+++ chromium-148.0.7778.96/build/config/compiler/BUILD.gn	2026-05-05 17:02:52.161082398 +0200
-@@ -1934,7 +1934,6 @@ config("sanitize_return") {
-       # sanitizer) is enabled, they then do expensive debug like operations. We
-       # want to suppress this behaviour since we want to keep performance costs
-       # as low as possible while having these checks.
--      "-fsanitize-ignore-for-ubsan-feature=return",
-     ]
-   }
- }
-diff -up chromium-147.0.7727.49/build/config/compiler/BUILD.gn.me chromium-147.0.7727.49/build/config/compiler/BUILD.gn
---- chromium-147.0.7727.49/build/config/compiler/BUILD.gn.me	2026-04-06 11:35:59.082476460 +0200
-+++ chromium-147.0.7727.49/build/config/compiler/BUILD.gn	2026-04-06 11:36:52.267527294 +0200
-@@ -617,7 +617,6 @@ config("compiler") {
-     # https://crbug.com/484082200 for background and https://crrev.com/c/7593035
-     # for discussion.
-     if (!is_wasm) {
--      cflags += [ "-fno-lifetime-dse" ]
-     }
- 
-     # TODO(hans): Remove this once Clang generates better optimized debug info

diff --git a/chromium-148-rust-1.88-build-error.patch b/chromium-148-rust-1.88-build-error.patch
deleted file mode 100644
index 8a50ab8..0000000
--- a/chromium-148-rust-1.88-build-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix build error with rust-1.88 on el9
-
-error[E0599]: no method named `file_as_c_str` found for reference `&Location<'_>` in the current scope
-   --> ../../base/logging/logger.rs:133:39
-    |
-133 |         info.location().map(|loc| loc.file_as_c_str()).unwrap_or(c"<unknown file>"),
-    |                                       ^^^^^^^^^^^^^ method not found in `&Location<'_>`
-
-diff -up chromium-148.0.7778.96/base/logging/logger.rs.me chromium-148.0.7778.96/base/logging/logger.rs
---- chromium-148.0.7778.96/base/logging/logger.rs.me	2026-05-07 22:18:41.995966833 +0200
-+++ chromium-148.0.7778.96/base/logging/logger.rs	2026-05-07 22:47:11.740773933 +0200
-@@ -128,9 +128,18 @@ mod ffi {
- }
- 
- fn panic_hook(info: &PanicHookInfo<'_>) {
-+    let file_storage;
-+    let file_name: &CStr = match info.location() {
-+        Some(loc) => {
-+            file_storage = CString::new(loc.file()).unwrap();
-+            file_storage.as_c_str()
-+        }
-+        None => c"<unknown file>",
-+    };
-+
-     print_rust_log(
-         &format_args!("{info}"),
--        info.location().map(|loc| loc.file_as_c_str()).unwrap_or(c"<unknown file>"),
-+        file_name,
-         info.location().map(|loc| loc.line()),
-         LOGGING_FATAL,
-         false,

diff --git a/chromium-148-use-system-rustc.patch b/chromium-148-use-system-rustc.patch
deleted file mode 100644
index a11a1f2..0000000
--- a/chromium-148-use-system-rustc.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Revert the commit to fix the build error:
-
-ninja: error: '../../third_party/rust-toolchain/bin/rustc', needed by 'phony/default_for_rust_host_build_tools_rust_bin_inputs', missing and no known rule to make it
-
-
-commit 9193ab90af24c23ee983e0a8da9bed45712f0d26
-Author: Takuto Ikuta <tikuta@chromium.org>
-Date:   Tue Mar 31 20:28:37 2026 -0700
-
-    Reland "build: Use tool inputs instead of siso config for rust actions"
-    
-    This reverts commit 080e6a7ab8ed54261b495db2b84140d6c5062af7.
-    
-    Reason for revert: Added inputs for remote action in cog build.
-    
-    Original change's description:
-    > Revert "build: Use tool inputs instead of siso config for rust actions"
-    >
-    > This reverts commit 3c3ae5ec818626d8efdaefd62ceb07dbbe5c6adf.
-    >
-    > Reason for revert: broke Cider build
-    >
-    > Original change's description:
-    > > build: Use tool inputs instead of siso config for rust actions
-    > >
-    > > Also remove unused filegroups.
-    > >
-    > > Bug: 491242305
-    > > Change-Id: If8da44a4741db7eced84ba20c1b69f4543b14217
-    > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7710197
-    > > Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
-    > > Reviewed-by: Junji Watanabe <jwata@google.com>
-    > > Cr-Commit-Position: refs/heads/main@{#1607564}
-    >
-    > Bug: 491242305, 498008190
-    > No-Presubmit: true
-    > No-Tree-Checks: true
-    > No-Try: true
-    > Bug: 491242305
-    > Change-Id: I2c9eb13d1a0bbed06b8b85353c6286bc542d74b1
-    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7716738
-    > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-    > Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
-    > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-    > Cr-Commit-Position: refs/heads/main@{#1607814}
-    
-    Bug: 491242305, 498008190
-    Bug: 491242305
-    Change-Id: I3c992a83dd50bb9695e9ab27f58906d16f05c367
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7719879
-    Reviewed-by: Junji Watanabe <jwata@google.com>
-    Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
-    Cr-Commit-Position: refs/heads/main@{#1608267}
-
-diff --git a/build/config/siso/rust.star b/build/config/siso/rust.star
-index 2a27a9d0c9d..db2dd5bf177 100644
---- a/build/config/siso/rust.star
-+++ b/build/config/siso/rust.star
-@@ -19,19 +19,11 @@ def __filegroups(ctx):
-         "third_party/rust-toolchain:toolchain": {
-             "type": "glob",
-             "includes": [
--                "bin/rustc",
-                 "lib/*.so",
-                 "lib/libclang.so.*",
--                "lib/rustlib/src/rust/library/std/src/lib.rs",
-                 "lib/rustlib/x86_64-unknown-linux-gnu/lib/*",
-             ],
-         },
--        "third_party/rust:rustlib": {
--            "type": "glob",
--            "includes": [
--                "*.rs",
--            ],
--        },
-         "build/linux/debian_bullseye_amd64-sysroot:rustlink": {
-             "type": "glob",
-             "includes": [
-@@ -295,7 +287,6 @@ def __step_config(ctx, step_config):
-             "command_prefix": "python3 ../../build/rust/gni_impl/run_build_script.py",
-             "inputs": [
-                 "third_party/rust-toolchain:toolchain",
--                "third_party/rust:rustlib",
-             ],
-             "handler": "rust_build_handler",
-             "remote": remote and config.get(ctx, "cog"),
-@@ -306,7 +297,6 @@ def __step_config(ctx, step_config):
-             "command_prefix": "python3 ../../build/rust/std/find_std_rlibs.py",
-             "inputs": [
-                 "third_party/rust-toolchain:toolchain",
--                "third_party/rust-toolchain/lib/rustlib:rlib",
-             ],
-             "remote": remote and config.get(ctx, "cog"),
-             "timeout": "2m",
-diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni
-index a993149fa64..8981cac7e19 100644
---- a/build/rust/cargo_crate.gni
-+++ b/build/rust/cargo_crate.gni
-@@ -455,6 +455,13 @@ template("cargo_crate") {
-         _rustflags_txt,
-         rustc_print_cfg_path,
-       ]
-+
-+      if (host_os == "win") {
-+        inputs += [ "//third_party/rust-toolchain/bin/rustc.exe" ]
-+      } else {
-+        inputs += [ "//third_party/rust-toolchain/bin/rustc" ]
-+      }
-+
-       build_script_target = ":${_build_script_name}($rust_macro_toolchain)"
-       deps = [
-         ":${_build_script_name}_write_rustflags",
-diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
-index f6561e4ed1e..6c8022bcb0c 100644
---- a/build/rust/std/BUILD.gn
-+++ b/build/rust/std/BUILD.gn
-@@ -267,6 +267,12 @@ if (toolchain_has_rust) {
-       out_libdir = rebase_path(target_out_dir, root_build_dir)
-       out_depfile = rebase_path(depfile, root_build_dir)
- 
-+      if (host_os == "win") {
-+        inputs = [ "//third_party/rust-toolchain/bin/rustc.exe" ]
-+      } else {
-+        inputs = [ "//third_party/rust-toolchain/bin/rustc" ]
-+      }
-+
-       # For the rustc sysroot we must include even the rlibs we don't pass to
-       # the C++ linker.
-       all_stdlibs_to_copy = stdlib_files + skip_stdlib_files
-diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
-index 8c64fcaf4dc..6c3298cbebd 100644
---- a/build/toolchain/gcc_toolchain.gni
-+++ b/build/toolchain/gcc_toolchain.gni
-@@ -681,6 +681,7 @@ template("single_gcc_toolchain") {
-         "//build/action_helpers.py",
-         "//build/gn_helpers.py",
-         "//build/rust/gni_impl/rustc_wrapper.py",
-+        "//third_party/rust-toolchain/bin/rustc",
-       ]
- 
-       # RSP manipulation due to https://bugs.chromium.org/p/gn/issues/detail?id=249

diff --git a/chromium-149-clang++-unknown-argument.patch b/chromium-149-clang++-unknown-argument.patch
new file mode 100644
index 0000000..9cc7b35
--- /dev/null
+++ b/chromium-149-clang++-unknown-argument.patch
@@ -0,0 +1,38 @@
+diff -up chromium-149.0.7827.53/build/config/compiler/BUILD.gn.me chromium-149.0.7827.53/build/config/compiler/BUILD.gn
+--- chromium-149.0.7827.53/build/config/compiler/BUILD.gn.me	2026-04-06 11:35:59.082476460 +0200
++++ chromium-149.0.7827.53/build/config/compiler/BUILD.gn	2026-04-06 11:36:52.267527294 +0200
+@@ -617,7 +617,6 @@ config("compiler") {
+     # https://crbug.com/484082200 for background and https://crrev.com/c/7593035
+     # for discussion.
+     if (!is_wasm) {
+-      cflags += [ "-fno-lifetime-dse" ]
+     }
+ 
+     # TODO(hans): Remove this once Clang generates better optimized debug info
+diff -up chromium-149.0.7827.53/build/config/compiler/BUILD.gn.me chromium-149.0.7827.53/build/config/compiler/BUILD.gn
+--- chromium-149.0.7827.53/build/config/compiler/BUILD.gn.me	2026-05-31 12:18:05.287133288 +0200
++++ chromium-149.0.7827.53/build/config/compiler/BUILD.gn	2026-05-31 12:19:16.908256575 +0200
+@@ -588,12 +588,6 @@ config("compiler") {
+   if (is_clang) {
+     # Flags for diagnostics.
+     cflags += [ "-fcolor-diagnostics" ]
+-    if (!is_win) {
+-      cflags += [ "-fdiagnostics-show-inlining-chain" ]
+-    } else {
+-      # Combine after https://github.com/llvm/llvm-project/pull/192241
+-      cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
+-    }
+     if (diagnostics_print_source_range_info && !is_win) {
+       cflags += [ "-fdiagnostics-print-source-range-info" ]
+     }
+diff -up chromium-149.0.7827.53/build/config/sanitizers/sanitizers.gni.me chromium-149.0.7827.53/build/config/sanitizers/sanitizers.gni
+--- chromium-149.0.7827.53/build/config/sanitizers/sanitizers.gni.me	2026-05-31 12:20:07.389243564 +0200
++++ chromium-149.0.7827.53/build/config/sanitizers/sanitizers.gni	2026-05-31 12:20:43.632843203 +0200
+@@ -540,7 +540,6 @@ template("ubsan_hardening") {
+         # be usable even in release builds, i.e. as widely as possible.
+         # It's important not to have full-on UBSan workarounds activate
+         # just because we built support for a specific sanitizer.
+-        "-fsanitize-ignore-for-ubsan-feature=${invoker.sanitizer}",
+       ]
+       if (defined(invoker.cflags)) {
+         cflags += invoker.cflags

diff --git a/chromium-149-rust-1.88-build-error.patch b/chromium-149-rust-1.88-build-error.patch
new file mode 100644
index 0000000..dde8b41
--- /dev/null
+++ b/chromium-149-rust-1.88-build-error.patch
@@ -0,0 +1,40 @@
+Fix build error with rust-1.88 on el9
+
+error[E0599]: no method named `file_as_c_str` found for reference `&Location<'_>` in the current scope
+   --> ../../base/logging/logger.rs:133:39
+    |
+133 |         info.location().map(|loc| loc.file_as_c_str()).unwrap_or(c"<unknown file>"),
+    |                                       ^^^^^^^^^^^^^ method not found in `&Location<'_>`
+
+diff -up chromium-149.0.7827.53/base/logging/rust_logger/custom_panic_hook.rs.rust-1.88-build-error chromium-149.0.7827.53/base/logging/rust_logger/custom_panic_hook.rs
+--- chromium-149.0.7827.53/base/logging/rust_logger/custom_panic_hook.rs.rust-1.88-build-error	2026-05-29 01:24:11.000000000 +0200
++++ chromium-149.0.7827.53/base/logging/rust_logger/custom_panic_hook.rs	2026-06-04 20:37:44.226326360 +0200
+@@ -4,6 +4,7 @@
+ 
+ use crate::print_rust_log;
+ use std::panic::PanicHookInfo;
++use std::ffi::{CStr, CString};
+ 
+ /// Routes `panic!` and similar macros to `LOG(FATAL)`.
+ pub(crate) fn init() {
+@@ -15,9 +16,19 @@ pub(crate) fn init() {
+ }
+ 
+ fn panic_hook(info: &PanicHookInfo<'_>) {
++    let file_storage;
++    let file_name: &CStr = match info.location() {
++        Some(loc) => {
++            file_storage = CString::new(loc.file()).unwrap();
++            file_storage.as_c_str()
++        }
++        None => c"<unknown file>",
++    };
++
++
+     print_rust_log::print_rust_log(
+         &format_args!("{info}"),
+-        info.location().map(|loc| loc.file_as_c_str()).unwrap_or(c"<unknown file>"),
++        file_name,
+         info.location().map(|loc| loc.line()),
+         print_rust_log::LogSeverity::Fatal,
+     )

diff --git a/chromium.spec b/chromium.spec
index 6d0b04a..3f048df 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -35,6 +35,12 @@
 	export NINJA_STATUS="[%2:%f/%t] " ; \
 	ninja -j %{numjobs} -C '%1' '%2'
 
+# enable|disable chrome_management_service
+%global build_chrome_management_service 1
+%if 0%{?flatpak}
+%global build_chrome_management_service 0
+%endif
+
 # enable|disable chromedriver
 %global build_chromedriver 1
 %if 0%{?flatpak}
@@ -262,7 +268,7 @@
 %endif
 
 Name:	chromium
-Version: 148.0.7778.215
+Version: 149.0.7827.53
 Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
@@ -274,9 +280,6 @@ Patch1: chromium-115-initial_prefs-etc-path.patch
 # Try to load widevine from other places
 Patch8: chromium-117-widevine-other-locations.patch
 
-# Enable Widevine on Arm64
-Patch9: chromium-147-widevine-on-arm64.patch
-
 # debian patches
 # disable font-test 
 Patch20: chromium-disable-font-tests.patch
@@ -318,10 +321,6 @@ Patch94: chromium-148-v8-sanitize-build-error.patch
 # 210 |     #[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))]
 Patch96: chromium-142-crabbyavif-ftbfs-old-rust.patch
 
-# FTBFS - /usr/include/bits/siginfo-consts.h:219:3: error: expected identifier
-# 219 |   SYS_SECCOMP = 1,              /* Seccomp triggered.  */
-Patch97: chromium-141-glibc-2.42-SYS_SECCOMP.patch
-
 # system ffmpeg
 # need for old ffmpeg 5.x on epel9
 Patch128: chromium-138-el9-ffmpeg-deprecated-apis.patch
@@ -342,11 +341,10 @@ Patch137: chromium-147-system-ffmpeg.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
-Patch142: chromium-148-rust-1.88-build-error.patch
+Patch142: chromium-149-rust-1.88-build-error.patch
 # fix ftbfs caused by old rustc-1.88 on el9 and 10.1
 Patch143: chromium-148-rust-1.88-enable-unstable_features.patch
 Patch144: chromium-146-rust-1.88-undefined-symbol.patch
-Patch145: chromium-148-use-system-rustc.patch
 
 # Fix FTBFS with python-3.9 on el9
 Patch146: chromium-148-el9-python-3.9-build-error.patch
@@ -401,8 +399,7 @@ Patch315: chromium-145-rustc-ftbfs.patch
 
 # llvm <= 22
 # clang++: error: unknown argument: '-fno-lifetime-dse'
-# clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=return'
-Patch316: chromium-148-clang++-unknown-argument.patch
+Patch316: chromium-149-clang++-unknown-argument.patch
 
 # unknown warning option -Wno-nontrivial-memcall
 Patch317: chromium-142-clang++-unknown-argument.patch
@@ -412,9 +409,6 @@ Patch318: memory-allocator-dcheck-assert-fix.patch
 # compile swiftshader against llvm-16.0
 Patch319: chromium-143-swiftshader-llvm-16.0.patch
 
-# Fix clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=array-bounds'
-Patch320: chromium-146-clang-unknown-argument.patch
-
 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2239523
 # https://bugs.chromium.org/p/chromium/issues/detail?id=1145581#c60
 # Disable BTI until this is fixed upstream.
@@ -500,6 +494,7 @@ Patch415: add-ppc64-pthread-stack-size.patch
 Patch417: 0001-add-xnn-ppc64el-support.patch
 Patch418: 0002-regenerate-xnn-buildgn.patch
 Patch419: 0009-sandbox-ignore-byte-span-error.patch
+Patch420: 0005-blink-add-audio-vector-support.patch
 
 # flatpak sandbox patches from
 # https://github.com/flathub/org.chromium.Chromium/tree/master/patches/chromium
@@ -1062,7 +1057,6 @@ Qt6 UI for chromium.
 ### Chromium Fedora Patches ###
 %patch -P1 -p1 -b .etc
 %patch -P8 -p1 -b .widevine-other-locations
-%patch -P9 -p1 -b .widevine-on-arm64
 
 %patch -P20 -p1 -b .disable-font-test
 %patch -P21 -p1 -b .screen-ai-service
@@ -1092,10 +1086,6 @@ Qt6 UI for chromium.
 %patch -P94 -p1 -R -b .v8-sanitize-build-error
 %patch -P96 -p1 -b .crabbyavif-ftbfs-old-rust
 
-%if 0%{?fedora} > 43 || 0%{?rhel} > 10
-%patch -P97 -p1 -b .glibc-2.42-SYS_SECCOMP
-%endif
-
 %if ! %{bundleffmpegfree}
 %if 0%{?rhel} == 9
 %patch -P128 -p1 -b .el9-ffmpeg-deprecated-apis
@@ -1119,7 +1109,6 @@ Qt6 UI for chromium.
 %patch -P143 -p1 -b .rust-1.88-enable-unstable_features
 %patch -P144 -p1 -b .rust-1.88-undefined-symbol
 %endif
-%patch -P145 -p1 -R -b .use-system-rustc
 
 %if 0%{?rhel} == 9
 %patch -P146 -p1 -b .el9-python-3.9-build-error
@@ -1162,7 +1151,6 @@ Qt6 UI for chromium.
 
 %patch -P318 -p1 -b .memory-allocator-dcheck-assert-fix
 %patch -P319 -p1 -b .swiftshader-llvm-16.0
-%patch -P320 -p1 -b .clang-unknown-argument
 
 %if %{disable_bti}
 %patch -P352 -p1 -b .workaround_for_crash_on_BTI_capable_system
@@ -1224,6 +1212,7 @@ Qt6 UI for chromium.
 %patch -P417 -p1 -b .0001-add-xnn-ppc64el-support
 %patch -P418 -p1 -b .0002-regenerate-xnn-buildgn
 %patch -P419 -p1 -b .0009-sandbox-ignore-byte-span-error
+%patch -P420 -p1 -b .0005-blink-add-audio-vector-support
 %endif
 
 %if 0%{?flatpak}
@@ -1272,6 +1261,10 @@ ln -sf $(which gn) buildtools/linux64/gn
 mkdir -p third_party/gperf/cipd/bin
 ln -fs $(which gperf) third_party/gperf/cipd/bin/gperf
 
+# Remove bundle gperf and replace it with system rustc
+mkdir -p third_party/rust-toolchain/bin/
+ln -fs $(which rustc) third_party/rust-toolchain/bin/rustc
+
 %if %{bundlelibusbx}
 # no hackity hack hack
 %else
@@ -1285,7 +1278,7 @@ cp -a $(pkg-config --variable=includedir libusb-1.0)/libusb-1.0/libusb.h third_p
 sed -i 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' chrome/common/channel_info_posix.cc
 
 # Fix hardcoded path in remoting code
-sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/daemon_controller_delegate_linux.cc
+sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/daemon_controller_delegate_linux_single_process.cc
 
 # bz#2265957, add correct platform
 sed -i "s/Linux x86_64/Linux %{_arch}/" components/embedder_support/user_agent_utils.cc
@@ -1651,6 +1644,10 @@ mkdir -p %{chromebuilddir} && cp -a $(which gn) %{chromebuilddir}/
 %build_target %{chromebuilddir} headless_shell
 %endif
 
+%if %{build_chrome_management_service}
+%build_target %{chromebuilddir} chrome_management_service
+%endif
+
 %install
 rm -rf %{buildroot}
 
@@ -1681,6 +1678,10 @@ pushd %{chromebuilddir}
 %endif
 	cp -a chrom*.pak resources.pak %{buildroot}%{chromium_path}
 	cp -a locales/*.pak %{buildroot}%{chromium_path}/locales/
+	cp -a MEIPreload/ PrivacySandboxAttestationsPreloaded/ %{buildroot}%{chromium_path}/
+%if %{build_chrome_management_service}
+	cp -a chrome_management_service %{buildroot}%{chromium_path}/chrome-management-service
+%endif
 	%ifarch x86_64 aarch64 ppc64le
 		cp -a libvk_swiftshader.so %{buildroot}%{chromium_path}
 		cp -a libvulkan.so.1 %{buildroot}%{chromium_path}
@@ -1779,13 +1780,20 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/chromium.conf
 %config %{_sysconfdir}/%{name}/master_preferences
 %config %{_sysconfdir}/%{name}/policies/
+%dir %{chromium_path}/MEIPreload/
+%dir %{chromium_path}/PrivacySandboxAttestationsPreloaded/
 %{_bindir}/chromium-browser
 %{chromium_path}/chrome_*.pak
 %{chromium_path}/chrome_crashpad_handler
 %{chromium_path}/resources.pak
 %{chromium_path}/chromium-browser
 %{chromium_path}/chromium-browser.sh
-%attr(4755, root, root) %{chromium_path}/chrome-sandbox
+%if %{build_chrome_management_service}
+%{chromium_path}/chrome-management-service
+%endif
+%{chromium_path}/MEIPreload/*
+%{chromium_path}/PrivacySandboxAttestationsPreloaded/*
+%{chromium_path}/chrome-sandbox
 %{_mandir}/man1/chromium-browser.*
 %{_datadir}/icons/hicolor/*/apps/chromium-browser.png
 %{_datadir}/applications/*.desktop
@@ -1893,6 +1901,438 @@ fi
 %endif
 
 %changelog
+* Fri Jun 05 2026 Than Ngo <than@redhat.com> - 149.0.7827.53-1
+- Update to 149.0.7827.53
+  * CVE-2026-10881: Out of bounds read and write in ANGLE
+  * CVE-2026-10882: Use after free in Network
+  * CVE-2026-10883: Out of bounds write in ANGLE
+  * CVE-2026-10884: Use after free in Chromecast
+  * CVE-2026-10885: Use after free in Chrome for iOS
+  * CVE-2026-10886: Use after free in FileSystem
+  * CVE-2026-10887: Use after free in Chromoting
+  * CVE-2026-10888: Use after free in Cast Streaming
+  * CVE-2026-10889: Out of bounds read in ANGLE
+  * CVE-2026-10890: Use after free in Cast
+  * CVE-2026-10891: Use after free in GFX
+  * CVE-2026-10892: Out of bounds write in GPU
+  * CVE-2026-10893: Use after free in Chromoting
+  * CVE-2026-10894: Use after free in Printing
+  * CVE-2026-10895: Use after free in Ozone
+  * CVE-2026-10896: Use after free in Chrome for iOS
+  * CVE-2026-10897: Out of bounds write in GPU
+  * CVE-2026-10898: Stack buffer overflow in GPU
+  * CVE-2026-10899: Use after free in Ozone
+  * CVE-2026-10900: Use after free in Passwords
+  * CVE-2026-10901: Use after free in Passwords
+  * CVE-2026-10902: Use after free in Ozone
+  * CVE-2026-10903: Use after free in WebRTC
+  * CVE-2026-10904: Inappropriate implementation in V8
+  * CVE-2026-10905: Use after free in Network
+  * CVE-2026-10906: Use after free in WebAuthentication
+  * CVE-2026-10907: Out of bounds write in ANGLE
+  * CVE-2026-10908: Use after free in FullScreen
+  * CVE-2026-10909: Use after free in Dawn
+  * CVE-2026-10910: Type Confusion in V8
+  * CVE-2026-10911: Insufficient validation of untrusted input in Media
+  * CVE-2026-10912: Insufficient validation of untrusted input in Extensions
+  * CVE-2026-10913: Use after free in ANGLE
+  * CVE-2026-10914: Use after free in ANGLE
+  * CVE-2026-10915: Use after free in Core
+  * CVE-2026-10916: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-10917: Insufficient validation of untrusted input in Media
+  * CVE-2026-10918: Use after free in Viz
+  * CVE-2026-10919: Use after free in ANGLE
+  * CVE-2026-10920: Insufficient validation of untrusted input in WebShare
+  * CVE-2026-10921: Integer overflow in Dawn
+  * CVE-2026-10922: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-10923: Use after free in WebAppInstalls
+  * CVE-2026-10924: Integer overflow in Chromecast
+  * CVE-2026-10925: Out of bounds write in Skia
+  * CVE-2026-10926: Use after free in Cast
+  * CVE-2026-10927: Out of bounds read in Dawn
+  * CVE-2026-10928: Script injection in Headless
+  * CVE-2026-10929: Heap buffer overflow in ANGLE
+  * CVE-2026-10930: Out of bounds read in ANGLE
+  * CVE-2026-10931: Use after free in FileSystem
+  * CVE-2026-10932: Use after free in UI
+  * CVE-2026-10933: Use after free in Audio
+  * CVE-2026-10934: Use after free in Autofill
+  * CVE-2026-10935: Inappropriate implementation in V8
+  * CVE-2026-10936: Type Confusion in V8
+  * CVE-2026-10937: Inappropriate implementation in Passwords
+  * CVE-2026-10938: Insufficient validation of untrusted input in Input
+  * CVE-2026-10939: Use after free in WebRTC
+  * CVE-2026-10940: Race in Codecs
+  * CVE-2026-10941: Out of bounds memory access in Skia
+  * CVE-2026-10942: Insufficient validation of untrusted input in UI
+  * CVE-2026-10943: Use after free in WebRTC
+  * CVE-2026-10944: Insufficient policy enforcement in Autofill
+  * CVE-2026-10945: Use after free in PDF
+  * CVE-2026-10946: Heap buffer overflow in Media
+  * CVE-2026-10947: Use after free in WebRTC
+  * CVE-2026-10948: Use after free in WebRTC
+  * CVE-2026-10949: Heap buffer overflow in Video
+  * CVE-2026-10950: Insufficient policy enforcement in Autofill
+  * CVE-2026-10951: Use after free in Autofill
+  * CVE-2026-10952: Use after free in Chrome for iOS
+  * CVE-2026-10953: Use after free in Core
+  * CVE-2026-10954: Use after free in Actor
+  * CVE-2026-10955: Type Confusion in ANGLE
+  * CVE-2026-10956: Use after free in MimeHandlerView
+  * CVE-2026-10957: Use after free in Glic
+  * CVE-2026-10958: Use after free in Chrome for iOS
+  * CVE-2026-10959: Use after free in Input
+  * CVE-2026-10960: Uninitialized Use in Codecs
+  * CVE-2026-10961: Use after free in Chrome for iOS
+  * CVE-2026-10962: Type Confusion in Media
+  * CVE-2026-10963: Integer overflow in V8
+  * CVE-2026-10964: Integer overflow in V8
+  * CVE-2026-10965: Integer overflow in DevTools
+  * CVE-2026-10966: Insufficient validation of untrusted input in Codecs
+  * CVE-2026-10967: Use after free in SurfaceCapture
+  * CVE-2026-10968: Insufficient validation of untrusted input in Dawn
+  * CVE-2026-10969: Insufficient validation of untrusted input in Extensions
+  * CVE-2026-10970: Insufficient validation of untrusted input in InterestGroups
+  * CVE-2026-10971: Insufficient validation of untrusted input in Printing
+  * CVE-2026-10972: Use after free in Ozone
+  * CVE-2026-10973: Uninitialized Use in Dawn
+  * CVE-2026-10974: Insufficient validation of untrusted input in ANGLE
+  * CVE-2026-10975: Use after free in WebRTC
+  * CVE-2026-10976: Uninitialized Use in Dawn
+  * CVE-2026-10977: Uninitialized Use in Skia
+  * CVE-2026-10978: Use after free in Chromoting
+  * CVE-2026-10979: Out of bounds read in ANGLE
+  * CVE-2026-10980: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-10981: Insufficient validation of untrusted input in Codecs
+  * CVE-2026-10982: Use after free in WebXR
+  * CVE-2026-10983: Insufficient validation of untrusted input in Dawn
+  * CVE-2026-10984: Inappropriate implementation in Accessibility
+  * CVE-2026-10985: Out of bounds read in Skia
+  * CVE-2026-10986: Integer overflow in Media
+  * CVE-2026-10987: Integer overflow in V8
+  * CVE-2026-10988: Use after free in Views
+  * CVE-2026-10989: Inappropriate implementation in V8
+  * CVE-2026-10990: Use after free in Glic
+  * CVE-2026-10991: Use after free in V8
+  * CVE-2026-10992: Insufficient data validation in Animation
+  * CVE-2026-10993: Heap buffer overflow in Skia
+  * CVE-2026-10994: Uninitialized Use in ANGLE
+  * CVE-2026-10995: Heap buffer overflow in TabStrip
+  * CVE-2026-10996: Inappropriate implementation in Workers
+  * CVE-2026-10997: Insufficient policy enforcement in Extensions
+  * CVE-2026-10998: Out of bounds read in Media
+  * CVE-2026-10999: Out of bounds memory access in ANGLE
+  * CVE-2026-11000: Use after free in Fonts
+  * CVE-2026-11001: Incorrect security UI in Payments
+  * CVE-2026-11002: Use after free in Autofill
+  * CVE-2026-11003: Use after free in WebRTC
+  * CVE-2026-11004: Out of bounds read in ANGLE
+  * CVE-2026-11005: Out of bounds read in ANGLE
+  * CVE-2026-11006: Out of bounds read in Dawn
+  * CVE-2026-11007: Insufficient validation of untrusted input in WebView
+  * CVE-2026-11008: Insufficient validation of untrusted input in WebAppInstalls
+  * CVE-2026-11009: Use after free in USB
+  * CVE-2026-11010: Use after free in WebShare
+  * CVE-2026-11011: Insufficient policy enforcement in Password Manager
+  * CVE-2026-11012: Use after free in Serial
+  * CVE-2026-11013: Insufficient validation of untrusted input in Network
+  * CVE-2026-11014: Insufficient policy enforcement in Extensions
+  * CVE-2026-11015: Out of bounds read in WebGPU
+  * CVE-2026-11016: Insufficient validation of untrusted input in Network
+  * CVE-2026-11017: Inappropriate implementation in Link Preview
+  * CVE-2026-11018: Insufficient policy enforcement in Actor
+  * CVE-2026-11019: Inappropriate implementation in Payments
+  * CVE-2026-11020: Inappropriate implementation in Extensions
+  * CVE-2026-11021: Insufficient validation of untrusted input in GPU
+  * CVE-2026-11022: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-11023: Insufficient validation of untrusted input in WebAppInstalls
+  * CVE-2026-11024: Stack buffer overflow in Skia
+  * CVE-2026-11025: Insufficient policy enforcement in Navigation
+  * CVE-2026-11026: Insufficient policy enforcement in Extensions
+  * CVE-2026-11027: Insufficient validation of untrusted input in Glic
+  * CVE-2026-11028: Use after free in Media
+  * CVE-2026-11029: Insufficient validation of untrusted input in Drag and Drop
+  * CVE-2026-11030: Use after free in Network
+  * CVE-2026-11031: Insufficient validation of untrusted input in Password Manager
+  * CVE-2026-11032: Insufficient data validation in Password Manager
+  * CVE-2026-11033: Uninitialized Use in WebML
+  * CVE-2026-11034: Insufficient validation of untrusted input in Tab Group Sync
+  * CVE-2026-11035: Insufficient validation of untrusted input in Custom Tabs
+  * CVE-2026-11036: Inappropriate implementation in DOM
+  * CVE-2026-11037: Out of bounds write in Codecs
+  * CVE-2026-11038: Insufficient validation of untrusted input in Subresource Integrity
+  * CVE-2026-11039: Uninitialized Use in Skia
+  * CVE-2026-11040: Use after free in ANGLE
+  * CVE-2026-11041: Insufficient validation of untrusted input in Media
+  * CVE-2026-11042: Use after free in Views
+  * CVE-2026-11043: Out of bounds write in ANGLE
+  * CVE-2026-11044: Integer overflow in ANGLE
+  * CVE-2026-11045: Insufficient validation of untrusted input in GPU
+  * CVE-2026-11046: Insufficient validation of untrusted input in Media
+  * CVE-2026-11047: Insufficient validation of untrusted input in Base
+  * CVE-2026-11048: Inappropriate implementation in Extensions
+  * CVE-2026-11049: Use after free in Password Manager
+  * CVE-2026-11050: Use after free in V8
+  * CVE-2026-11051: Out of bounds read in ANGLE
+  * CVE-2026-11052: Type Confusion in GPU
+  * CVE-2026-11053: VULNERABILITY in WebRTC
+  * CVE-2026-11054: Use after free in WebRTC
+  * CVE-2026-11055: Use after free in ANGLE
+  * CVE-2026-11056: Insufficient validation of untrusted input in SiteIsolation
+  * CVE-2026-11057: Uninitialized Use in Skia
+  * CVE-2026-11058: Integer overflow in CredentialProvider
+  * CVE-2026-11059: Use after free in Blink
+  * CVE-2026-11060: Use after free in Media
+  * CVE-2026-11061: Out of bounds read in ANGLE
+  * CVE-2026-11062: Insufficient policy enforcement in Extensions
+  * CVE-2026-11063: Insufficient validation of untrusted input in WebNN
+  * CVE-2026-11064: Uninitialized Use in GPU
+  * CVE-2026-11065: Use after free in ANGLE
+  * CVE-2026-11066: Insufficient validation of untrusted input in ANGLE
+  * CVE-2026-11067: Uninitialized Use in Dawn
+  * CVE-2026-11068: Use after free in WebSockets
+  * CVE-2026-11069: Insufficient validation of untrusted input in Cast
+  * CVE-2026-11070: Insufficient validation of untrusted input in Chromoting
+  * CVE-2026-11071: Use after free in Base
+  * CVE-2026-11072: Use after free in WebView
+  * CVE-2026-11073: Use after free in WebGL
+  * CVE-2026-11074: Use after free in WebRTC
+  * CVE-2026-11075: Out of bounds read in V8
+  * CVE-2026-11076: Type Confusion in CSS
+  * CVE-2026-11077: Out of bounds read in Dawn
+  * CVE-2026-11078: Insufficient validation of untrusted input in FileSystem
+  * CVE-2026-11079: Insufficient validation of untrusted input in Codecs
+  * CVE-2026-11080: Use after free in WebView
+  * CVE-2026-11081: Policy bypass in Canvas
+  * CVE-2026-11082: Use after free in GPU
+  * CVE-2026-11083: Inappropriate implementation in Password Manager
+  * CVE-2026-11084: Inappropriate implementation in Password Manager
+  * CVE-2026-11085: Integer overflow in GPU
+  * CVE-2026-11086: Insufficient validation of untrusted input in Dawn
+  * CVE-2026-11087: Uninitialized Use in ANGLE
+  * CVE-2026-11088: Integer overflow in ANGLE
+  * CVE-2026-11089: Uninitialized Use in Media
+  * CVE-2026-11090: Uninitialized Use in ANGLE
+  * CVE-2026-11091: Inappropriate implementation in Dawn
+  * CVE-2026-11092: Insufficient policy enforcement in DevTools
+  * CVE-2026-11093: Insufficient validation of untrusted input in Printing
+  * CVE-2026-11094: Use after free in Codecs
+  * CVE-2026-11095: Insufficient validation of untrusted input in Codecs
+  * CVE-2026-11096: Out of bounds read in WebRTC
+  * CVE-2026-11097: Inappropriate implementation in WebView
+  * CVE-2026-11098: Insufficient validation of untrusted input in GPU
+  * CVE-2026-11099: Vulnerability in Skia
+  * CVE-2026-11100: Use after free in File Input
+  * CVE-2026-11101: Uninitialized Use in Dawn
+  * CVE-2026-11102: Inappropriate implementation in Isolated Web Apps
+  * CVE-2026-11103: Inappropriate implementation in Installer
+  * CVE-2026-11104: Uninitialized Use in ANGLE
+  * CVE-2026-11105: Insufficient validation of untrusted input in WebUI
+  * CVE-2026-11106: Inappropriate implementation in Media
+  * CVE-2026-11107: Inappropriate implementation in Downloads
+  * CVE-2026-11108: Inappropriate implementation in NFC
+  * CVE-2026-11109: Uninitialized Use in ANGLE
+  * CVE-2026-11110: Uninitialized Use in ANGLE
+  * CVE-2026-11111: Out of bounds read in ANGLE
+  * CVE-2026-11112: Insufficient validation of untrusted input in Chromoting
+  * CVE-2026-11113: Insufficient validation of untrusted input in ANGLE
+  * CVE-2026-11114: Use after free in Device Trust
+  * CVE-2026-11115: Use after free in Updater
+  * CVE-2026-11116: Use after free in Chromoting
+  * CVE-2026-11117: Use after free in Views
+  * CVE-2026-11118: Use after free in WebRTC
+  * CVE-2026-11119: Insufficient validation of untrusted input in GPU
+  * CVE-2026-11120: Insufficient validation of untrusted input in Enterprise Reporting
+  * CVE-2026-11121: Insufficient validation of untrusted input in Skia
+  * CVE-2026-11122: Inappropriate implementation in Keyboard
+  * CVE-2026-11123: Uninitialized Use in ANGLE
+  * CVE-2026-11124: Heap buffer overflow in Skia
+  * CVE-2026-11125: Use after free in Compositing
+  * CVE-2026-11126: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-11127: Inappropriate implementation in WebAPKs
+  * CVE-2026-11128: Insufficient validation of untrusted input in Web Share
+  * CVE-2026-11129: Inappropriate implementation in Extensions
+  * CVE-2026-11130: Use after free in Media
+  * CVE-2026-11131: Use after free in Autofill
+  * CVE-2026-11132: Policy bypass in Paint
+  * CVE-2026-11133: Insufficient policy enforcement in Paint
+  * CVE-2026-11134: Insufficient data validation in Media
+  * CVE-2026-11135: Insufficient policy enforcement in Autofill
+  * CVE-2026-11136: Use after free in Canvas
+  * CVE-2026-11137: Uninitialized Use in ANGLE
+  * CVE-2026-11138: Uninitialized Use in ANGLE
+  * CVE-2026-11139: Policy bypass in Paint
+  * CVE-2026-11140: Insufficient validation of untrusted input in Chromecast
+  * CVE-2026-11141: Uninitialized Use in Audio
+  * CVE-2026-11142: Policy bypass in Paint
+  * CVE-2026-11143: Heap buffer overflow in Extensions
+  * CVE-2026-11144: Use after free in Media
+  * CVE-2026-11145: Race in Geolocation
+  * CVE-2026-11146: Insufficient validation of untrusted input in Chromoting
+  * CVE-2026-11147: Use after free in WebML
+  * CVE-2026-11148: Inappropriate implementation in Payments
+  * CVE-2026-11149: Insufficient validation of untrusted input in Extensions
+  * CVE-2026-11150: Inappropriate implementation in XML
+  * CVE-2026-11151: Insufficient validation of untrusted input in Password Manager
+  * CVE-2026-11152: Object lifecycle issue in Dawn
+  * CVE-2026-11153: Side-channel information leakage in Forms
+  * CVE-2026-11154: Use after free in Dawn
+  * CVE-2026-11155: Insufficient policy enforcement in CSS
+  * CVE-2026-11156: Inappropriate implementation in CSS
+  * CVE-2026-11157: Script injection in Accessibility
+  * CVE-2026-11158: Insufficient validation of untrusted input in Downloads
+  * CVE-2026-11159: Uninitialized Use in Skia
+  * CVE-2026-11160: Out of bounds read in Input
+  * CVE-2026-11161: Insufficient data validation in DataTransfer
+  * CVE-2026-11162: Insufficient policy enforcement in CSS
+  * CVE-2026-11163: Use after free in Messages
+  * CVE-2026-11164: Use after free in Blink
+  * CVE-2026-11165: Use after free in WebMIDI
+  * CVE-2026-11166: Inappropriate implementation in SVG
+  * CVE-2026-11167: Inappropriate implementation in WebView
+  * CVE-2026-11168: Insufficient policy enforcement in Extensions
+  * CVE-2026-11169: Inappropriate implementation in XML
+  * CVE-2026-11170: Inappropriate implementation in Chromoting
+  * CVE-2026-11171: Integer overflow in Blink
+  * CVE-2026-11172: Incorrect security UI in Contact Picker
+  * CVE-2026-11173: Out of bounds write in V8
+  * CVE-2026-11174: Insufficient policy enforcement in Site Isolation
+  * CVE-2026-11175: Incorrect security UI in Messages
+  * CVE-2026-11176: Inappropriate implementation in Media
+  * CVE-2026-11177: Use after free in Omnibox
+  * CVE-2026-11178: Policy bypass in WebView
+  * CVE-2026-11179: Inappropriate implementation in ORB
+  * CVE-2026-11180: Policy bypass in SVG
+  * CVE-2026-11181: Inappropriate implementation in Media Session
+  * CVE-2026-11182: Inappropriate implementation in SVG
+  * CVE-2026-11183: Out of bounds read in GWP-ASan
+  * CVE-2026-11184: Insufficient policy enforcement in Actor
+  * CVE-2026-11185: Use after free in V8
+  * CVE-2026-11186: Inappropriate implementation in CSS
+  * CVE-2026-11187: Insufficient policy enforcement in Glic
+  * CVE-2026-11188: Use after free in USB
+  * CVE-2026-11189: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-11190: Insufficient policy enforcement in Extensions
+  * CVE-2026-11191: Out of bounds memory access in ANGLE
+  * CVE-2026-11192: Insufficient validation of untrusted input in Password Manager
+  * CVE-2026-11193: Insufficient policy enforcement in Password Manager
+  * CVE-2026-11194: Inappropriate implementation in Network
+  * CVE-2026-11195: Inappropriate implementation in MHTML
+  * CVE-2026-11196: Type Confusion in XML
+  * CVE-2026-11197: Insufficient policy enforcement in Workers
+  * CVE-2026-11198: Insufficient validation of untrusted input in Codecs
+  * CVE-2026-11199: Insufficient validation of untrusted input in WebRTC
+  * CVE-2026-11200: Inappropriate implementation in WebRTC
+  * CVE-2026-11201: Use after free in ServiceWorker
+  * CVE-2026-11202: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-11203: Policy bypass in GPU
+  * CVE-2026-11204: Inappropriate implementation in Signin
+  * CVE-2026-11205: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-11206: Policy bypass in ServiceWorker
+  * CVE-2026-11207: Insufficient validation of untrusted input in Autofill
+  * CVE-2026-11208: Use after free in Codecs
+  * CVE-2026-11209: Insufficient policy enforcement in Passwords
+  * CVE-2026-11210: Insufficient policy enforcement in Safe Browsing
+  * CVE-2026-11211: Integer overflow in V8
+  * CVE-2026-11212: Insufficient policy enforcement in DevTools
+  * CVE-2026-11213: Insufficient validation of untrusted input in Reading Mode
+  * CVE-2026-11214: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-11215: Inappropriate implementation in Cronet
+  * CVE-2026-11216: Incorrect security UI in File Input
+  * CVE-2026-11217: Insufficient policy enforcement in Fenced Frames
+  * CVE-2026-11218: Inappropriate implementation in PlatformIntegration
+  * CVE-2026-11219: Insufficient data validation in Navigation
+  * CVE-2026-11220: Insufficient validation of untrusted input in Navigation
+  * CVE-2026-11221: Insufficient validation of untrusted input in PointerLock
+  * CVE-2026-11222: Incorrect security UI in Tab Strip
+  * CVE-2026-11223: Insufficient validation of untrusted input in Network
+  * CVE-2026-11224: Use after free in Chromoting
+  * CVE-2026-11225: Incorrect security UI in WebUI
+  * CVE-2026-11226: Insufficient policy enforcement in PreviewTab
+  * CVE-2026-11227: Incorrect security UI in Tab Hover Cards
+  * CVE-2026-11228: Incorrect security UI in File Input
+  * CVE-2026-11229: Insufficient policy enforcement in Enterprise
+  * CVE-2026-11230: Use after free in Extensions
+  * CVE-2026-11231: Inappropriate implementation in Safe Browsing
+  * CVE-2026-11232: Inappropriate implementation in TabGroups
+  * CVE-2026-11233: Insufficient validation of untrusted input in FoldableAPIs
+  * CVE-2026-11234: Insufficient policy enforcement in FoldableAPIs
+  * CVE-2026-11235: Insufficient validation of untrusted input in Compositing
+  * CVE-2026-11236: Insufficient policy enforcement in Web Bluetooth
+  * CVE-2026-11237: Insufficient validation of untrusted input in Media
+  * CVE-2026-11238: Inappropriate implementation in DevTools
+  * CVE-2026-11239: Insufficient validation of untrusted input in Extensions
+  * CVE-2026-11240: Insufficient validation of untrusted input in Loader
+  * CVE-2026-11241: Insufficient validation of untrusted input in Cast
+  * CVE-2026-11242: Insufficient validation of untrusted input in Plugins
+  * CVE-2026-11243: Incorrect security UI in Downloads
+  * CVE-2026-11244: Insufficient validation of untrusted input in WebAuthentication
+  * CVE-2026-11245: Inappropriate implementation in Payments
+  * CVE-2026-11246: Insufficient validation of untrusted input in IndexedDB
+  * CVE-2026-11247: Insufficient policy enforcement in CustomTabs
+  * CVE-2026-11248: Policy bypass in Google Lens
+  * CVE-2026-11249: Use after free in Network
+  * CVE-2026-11250: Inappropriate implementation in DevTools
+  * CVE-2026-11251: Insufficient validation of untrusted input in Password Manager
+  * CVE-2026-11252: Policy bypass in Content Settings
+  * CVE-2026-11253: Race in Permissions
+  * CVE-2026-11254: Inappropriate implementation in Permissions
+  * CVE-2026-11255: Insufficient validation of untrusted input in Storage Access API
+  * CVE-2026-11256: Out of bounds read in GPU
+  * CVE-2026-11257: Inappropriate implementation in Browser
+  * CVE-2026-11258: Inappropriate implementation in File System Access
+  * CVE-2026-11259: Insufficient validation of untrusted input in Cast
+  * CVE-2026-11260: Policy bypass in Permissions
+  * CVE-2026-11261: Insufficient validation of untrusted input in PDF
+  * CVE-2026-11262: Use after free in TabStrip
+  * CVE-2026-11263: Insufficient policy enforcement in WebAuthentication
+  * CVE-2026-11264: Policy bypass in Content Security Policy
+  * CVE-2026-11265: Insufficient data validation in Autofill
+  * CVE-2026-11266: Policy bypass in SafeBrowsing
+  * CVE-2026-11267: Insufficient policy enforcement in Extensions
+  * CVE-2026-11268: Uninitialized Use in ANGLE
+  * CVE-2026-11269: Inappropriate implementation in Extensions
+  * CVE-2026-11270: Inappropriate implementation in UI
+  * CVE-2026-11271: Incorrect security UI in Passwords
+  * CVE-2026-11272: Insufficient validation of untrusted input in Reading List
+  * CVE-2026-11273: Insufficient validation of untrusted input in Omnibox
+  * CVE-2026-11274: Inappropriate implementation in DOM Distiller
+  * CVE-2026-11275: Insufficient policy enforcement in Page Info
+  * CVE-2026-11276: Inappropriate implementation in Cast
+  * CVE-2026-11277: Insufficient policy enforcement in Chrome for iOS
+  * CVE-2026-11278: Inappropriate implementation in CustomTabs
+  * CVE-2026-11279: Out of bounds read in DevTools
+  * CVE-2026-11280: Insufficient validation of untrusted input in Signin
+  * CVE-2026-11281: Integer overflow in Chromoting
+  * CVE-2026-11282: Policy bypass in Sandbox
+  * CVE-2026-11283: Policy bypass in Shortcuts
+  * CVE-2026-11284: Side-channel information leakage in PerformanceAPIs
+  * CVE-2026-11285: Insufficient policy enforcement in Chrome for iOS
+  * CVE-2026-11286: Insufficient validation of untrusted input in Wallet
+  * CVE-2026-11287: Insufficient validation of untrusted input in Navigation
+  * CVE-2026-11288: Policy bypass in CSS
+  * CVE-2026-11289: Side-channel information leakage in Paint
+  * CVE-2026-11290: Integer overflow in WebView
+  * CVE-2026-11291: Policy bypass in Android Autofill
+  * CVE-2026-11292: Policy bypass in Blink
+  * CVE-2026-11293: Use after free in Input
+  * CVE-2026-11294: Inappropriate implementation in Passwords
+  * CVE-2026-11295: Inappropriate implementation in WebView
+  * CVE-2026-11296: Inappropriate implementation in ImageCapture
+  * CVE-2026-11297: Insufficient validation of untrusted input in Reader Mode
+  * CVE-2026-11298: Insufficient policy enforcement in Chrome for iOS
+  * CVE-2026-11299: Out of bounds read in Fonts
+  * CVE-2026-11300: Inappropriate implementation in Permissions
+  * CVE-2026-11301: Out of bounds read in LiveCaption
+  * CVE-2026-11302: Insufficient policy enforcement in Chrome for iOS
+  * CVE-2026-11303: Use after free in PDFium
+  * CVE-2026-11304: Use after free in PDFium
+  * CVE-2026-11305: Use after free in PDFium
+  * CVE-2026-11306: Use after free in PDFium
+  * CVE-2026-11307: Use after free in PDFium
+  * CVE-2026-11308: Inappropriate implementation in Extensions
+  * CVE-2026-11309: Insufficient policy enforcement in History
+
 * Fri May 29 2026 Than Ngo <than@redhat.com> - 148.0.7778.215-1
 - Update to 148.0.7778.215
   * CVE-2026-9872: Out of bounds write in GPU

diff --git a/disable-ai.patch b/disable-ai.patch
index 567e1db..f0ca662 100644
--- a/disable-ai.patch
+++ b/disable-ai.patch
@@ -1,93 +1,59 @@
 # Disable Glic ("Gemini Live in Chrome"), ScreenAI, and associated AI-based
-# features.
+# features
 
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -3396,10 +3396,6 @@ static_library("browser") {
-     allow_circular_includes_from += [ "//chrome/browser/payments:impl" ]
+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
+@@ -58,7 +58,6 @@ source_set("accessibility") {
+     public_deps += [
+       "//chrome/browser/accessibility/live_caption",
+       "//chrome/browser/profiles:profile_manager",
+-      "//chrome/browser/screen_ai:screen_ai_install_state",
+       "//components/live_caption",
+       "//components/pref_registry",
+       "//ui/accessibility/platform",
+@@ -87,8 +86,6 @@ source_set("impl") {
  
+   if (!is_android) {
      sources += [
--      "accessibility/ax_main_node_annotator_controller.cc",
--      "accessibility/ax_main_node_annotator_controller.h",
--      "accessibility/ax_main_node_annotator_controller_factory.cc",
--      "accessibility/ax_main_node_annotator_controller_factory.h",
-       "accessibility/caption_bubble_context_browser.h",
-       "accessibility/embedded_a11y_extension_loader.cc",
-       "accessibility/embedded_a11y_extension_loader.h",
-@@ -3829,8 +3825,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",
-@@ -3880,10 +3874,6 @@ static_library("browser") {
-       "//chrome/browser/record_replay",
-       "//chrome/browser/record_replay:impl",
-       "//chrome/browser/resource_coordinator",
--      "//chrome/browser/screen_ai:prefs",
--      "//chrome/browser/screen_ai:screen_ai_install_state",
+-      "ax_main_node_annotator_controller.cc",
+-      "ax_main_node_annotator_controller_factory.cc",
+       "embedded_a11y_extension_loader.cc",
+       "invert_bubble_prefs.cc",
+       "page_colors_controller.cc",
+@@ -98,7 +95,6 @@ source_set("impl") {
+       "//chrome/browser/accessibility/live_caption:impl",
+       "//chrome/browser/extensions",
+       "//chrome/browser/on_device_translation",
+-      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
+       "//chrome/browser/ui",
+       "//chrome/browser/ui/browser_window",
+       "//components/live_caption:live_translate",
+@@ -240,10 +236,6 @@ if (!is_android) {
+       deps += [ "//chrome/browser/accessibility/live_caption:test_support" ]
+     }
+ 
+-    deps += [
 -      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
--      "//chrome/browser/screen_ai/public:optical_character_recognizer",
-       "//chrome/browser/sharing_hub",
-       "//chrome/browser/sharing_hub:impl",
-       "//chrome/browser/smart_card",
-@@ -3960,7 +3950,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",
-@@ -4065,9 +4054,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",
-@@ -4264,8 +4250,6 @@ static_library("browser") {
-       sources += [
-         "accessibility/soda_installer_impl.cc",
-         "accessibility/soda_installer_impl.h",
--        "component_updater/screen_ai_component_installer.cc",
--        "component_updater/screen_ai_component_installer.h",
-         "download/bubble/download_bubble_accessible_alerts_map.cc",
-         "download/bubble/download_bubble_accessible_alerts_map.h",
-         "download/bubble/download_bubble_display_info.cc",
-@@ -4313,8 +4297,6 @@ static_library("browser") {
-         "profiles/profile_activity_metrics_recorder.h",
-         "profiles/profile_list_desktop.cc",
-         "profiles/profile_list_desktop.h",
--        "screen_ai/screen_ai_downloader_non_chromeos.cc",
--        "screen_ai/screen_ai_downloader_non_chromeos.h",
-         "signin/force_signin_verifier.cc",
-         "signin/force_signin_verifier.h",
-       ]
-@@ -5117,7 +5099,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/support_tool/ash",
-       "//chrome/browser/ui/ash/accelerator",
-@@ -5381,7 +5362,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/tree_fixing/BUILD.gn
-+++ b/chrome/browser/accessibility/tree_fixing/BUILD.gn
+-    ]
+ 
+     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") {
+     "//chrome/browser/accessibility",
+     "//chrome/browser/extensions",
+     "//chrome/browser/on_device_translation",
+-    "//chrome/browser/screen_ai:screen_ai_service_router_factory",
+     "//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
 @@ -63,11 +63,9 @@ source_set("internal") {
    deps = [
      "//base",
@@ -100,9 +66,10 @@
 -    "//services/screen_ai/public/mojom",
    ]
  }
---- a/chrome/browser/actor/actor_keyed_service.cc
-+++ b/chrome/browser/actor/actor_keyed_service.cc
-@@ -616,13 +616,6 @@ bool ActorKeyedService::IsActiveOnTab(co
+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
  
  ActorTask* ActorKeyedService::GetTaskFromTab(
      const tabs::TabInterface& tab) const {
@@ -116,19 +83,21 @@
    return nullptr;
  }
  
---- a/chrome/browser/actor/ui/actor_ui_tab_controller.cc
-+++ b/chrome/browser/actor/ui/actor_ui_tab_controller.cc
-@@ -49,7 +49,6 @@ ActorUiTabController::ActorUiTabControll
-                               base::Unretained(this))),
+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
+@@ -50,7 +50,6 @@ ActorUiTabController::ActorUiTabControll
        scoped_unowned_user_data_(tab.GetUnownedUserDataHost(), *this) {
+   CHECK(base::FeatureList::IsEnabled(features::kGlicActorUi));
    CHECK(base::FeatureList::IsEnabled(features::kGlicActor));
 -  CHECK(actor_keyed_service_);
  }
  
  ActorUiTabController::~ActorUiTabController() = default;
---- a/chrome/browser/browser_process_impl.cc
-+++ b/chrome/browser/browser_process_impl.cc
-@@ -259,12 +259,10 @@ void OnLocalStatePrefsLoaded();
+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();
  #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"
@@ -141,7 +110,7 @@
  #include "chrome/browser/usb/usb_status_icon.h"
  #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
  #endif
-@@ -1641,9 +1639,6 @@ void BrowserProcessImpl::PreMainMessageL
+@@ -1652,9 +1650,6 @@ void BrowserProcessImpl::PreMainMessageL
    soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -151,8 +120,9 @@
  
    base::FilePath user_data_dir;
    bool result = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
---- a/chrome/browser/browser_process_impl.h
-+++ b/chrome/browser/browser_process_impl.h
+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
 @@ -95,9 +95,6 @@ namespace speech {
  class SodaInstaller;
  }  // namespace speech
@@ -163,7 +133,7 @@
  
  namespace supervised_user {
  class DeviceParentalControls;
-@@ -457,9 +454,6 @@ class BrowserProcessImpl : public Browse
+@@ -461,9 +458,6 @@ class BrowserProcessImpl : public Browse
    // to ensure that SodaInstallerImpl gets destructed first.
    std::unique_ptr<speech::SodaInstaller> soda_installer_impl_;
  
@@ -173,8 +143,67 @@
  #endif
  
    std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
---- a/chrome/browser/chrome_browser_interface_binders.cc
-+++ b/chrome/browser/chrome_browser_interface_binders.cc
+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
 @@ -85,8 +85,6 @@
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -223,9 +252,10 @@
  #endif
  
  #if BUILDFLAG(IS_WIN)
---- a/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
-+++ b/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
-@@ -511,8 +511,6 @@ void PopulateChromeWebUIFrameBindersPart
+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
        ::mojom::app_service_internals::AppServiceInternalsPageHandler,
        AppServiceInternalsUI>(map);
  
@@ -234,9 +264,27 @@
  
    RegisterWebUIControllerInterfaceBinder<
        access_code_cast::mojom::PageHandlerFactory,
---- a/chrome/browser/component_updater/registration.cc
-+++ b/chrome/browser/component_updater/registration.cc
-@@ -53,8 +53,6 @@
+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") {
+     ]
+   }
+ 
+-  if (!is_android && !is_chromeos) {
+-    sources += [ "screen_ai_component_installer.cc" ]
+-    deps += [
+-      "//chrome/browser/screen_ai:screen_ai_install_state",
+-      "//services/screen_ai/public/cpp:utilities",
+-    ]
+-  }
+ 
+   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 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.h"
@@ -245,7 +293,7 @@
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if !BUILDFLAG(IS_ANDROID)
-@@ -209,9 +207,6 @@ void RegisterComponentsForUpdate() {
+@@ -200,9 +198,6 @@ void RegisterComponentsForUpdate() {
    RegisterRealTimeUrlChecksAllowlistComponent(cus);
  #endif  // BUIDLFLAG(IS_ANDROID)
  
@@ -255,8 +303,9 @@
  
    RegisterCommerceHeuristicsComponent(cus);
  
---- a/chrome/browser/glic/host/glic_skills_manager_impl.cc
-+++ b/chrome/browser/glic/host/glic_skills_manager_impl.cc
+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
  
  void GlicSkillsManagerImpl::UpdateSkillPreviews(
@@ -293,8 +342,9 @@
  }
  
  tabs::TabInterface* GlicSkillsManagerImpl::EnsureTabForSkills() {
---- a/chrome/browser/navigation_predictor/navigation_predictor.cc
-+++ b/chrome/browser/navigation_predictor/navigation_predictor.cc
+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
 @@ -18,8 +18,6 @@
  #include "base/time/default_tick_clock.h"
  #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service.h"
@@ -396,8 +446,9 @@
  }
  
  void NavigationPredictor::SetModelScoreCallbackForTesting(
---- a/chrome/browser/page_content_annotations/page_content_annotations_service_factory.cc
-+++ b/chrome/browser/page_content_annotations/page_content_annotations_service_factory.cc
+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
 @@ -118,62 +118,6 @@ PageContentAnnotationsServiceFactory::~P
  std::unique_ptr<KeyedService>
  PageContentAnnotationsServiceFactory::BuildServiceInstanceForBrowserContext(
@@ -461,9 +512,10 @@
    return nullptr;
  }
  
---- a/chrome/browser/password_manager/password_change_delegate_impl.cc
-+++ b/chrome/browser/password_manager/password_change_delegate_impl.cc
-@@ -338,16 +338,6 @@ void PasswordChangeDelegateImpl::StartPa
+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
        base::BindRepeating(&PasswordChangeDelegateImpl::OnLoginStateCheckResult,
                            weak_ptr_factory_.GetWeakPtr()));
  
@@ -480,9 +532,10 @@
  }
  
  void PasswordChangeDelegateImpl::OnLoginStateCheckResult(
---- a/chrome/browser/pdf/pdf_extension_util.cc
-+++ b/chrome/browser/pdf/pdf_extension_util.cc
-@@ -128,7 +128,6 @@ base::DictValue GetPdfViewerStrings() {
+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() {
        {"rotationStateLabel90", IDS_PDF_ROTATION_STATE_LABEL_90},
        {"rotationStateLabel180", IDS_PDF_ROTATION_STATE_LABEL_180},
        {"rotationStateLabel270", IDS_PDF_ROTATION_STATE_LABEL_270},
@@ -490,8 +543,9 @@
        {"sidebarLabel", IDS_PDF_SIDEBAR_LABEL},
        {"thumbnailPageAriaLabel", IDS_PDF_THUMBNAIL_PAGE_ARIA_LABEL},
        {"tooltipAttachments", IDS_PDF_TOOLTIP_ATTACHMENTS},
---- a/chrome/browser/permissions/BUILD.gn
-+++ b/chrome/browser/permissions/BUILD.gn
+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
 @@ -43,12 +43,6 @@ source_set("permissions") {
      "prediction_service/language_detection_observer.h",
      "prediction_service/passage_embedder_delegate.cc",
@@ -505,8 +559,9 @@
      "prediction_service/prediction_service_factory.cc",
      "prediction_service/prediction_service_factory.h",
      "prediction_service/prediction_service_request.cc",
---- a/chrome/browser/permissions/chrome_permissions_client.cc
-+++ b/chrome/browser/permissions/chrome_permissions_client.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
 @@ -29,7 +29,6 @@
  #include "chrome/browser/permissions/permission_actions_history_factory.h"
  #include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h"
@@ -515,7 +570,7 @@
  #include "chrome/browser/permissions/pref_based_quiet_permission_ui_selector.h"
  #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
  #include "chrome/browser/permissions/system/system_permission_settings.h"
-@@ -475,8 +474,6 @@ ChromePermissionsClient::CreatePermissio
+@@ -476,8 +475,6 @@ ChromePermissionsClient::CreatePermissio
  #endif
    selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
        Profile::FromBrowserContext(browser_context)));
@@ -524,7 +579,7 @@
    return selectors;
  }
  
-@@ -498,8 +495,6 @@ void ChromePermissionsClient::OnPromptRe
+@@ -499,8 +496,6 @@ void ChromePermissionsClient::OnPromptRe
  
    Profile* profile =
        Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ -533,8 +588,9 @@
  
    if (request_type == permissions::RequestType::kNotifications) {
      if (action == permissions::PermissionAction::GRANTED &&
---- a/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc
-+++ b/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc
+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
 @@ -26,18 +26,6 @@ PassageEmbedderDelegate::PassageEmbedder
      : profile_(profile) {}
  
@@ -554,9 +610,10 @@
    PermissionUmaUtil::RecordPassageEmbedderMetadataValid(false);
    return nullptr;
  }
---- a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
-+++ b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
-@@ -797,7 +797,7 @@ void PermissionsAiUiSelector::ExecuteOnD
+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
      ModelExecutionData model_data) {
    VLOG(1) << "[PermissionsAI] ExecuteOnDeviceAivXModel";
    PredictionModelHandlerProvider* prediction_model_handler_provider =
@@ -565,19 +622,10 @@
    if (prediction_model_handler_provider) {
      permissions::RequestType request_type =
          model_data.request_metadata.request_type;
---- a/chrome/browser/prefs/BUILD.gn
-+++ b/chrome/browser/prefs/BUILD.gn
-@@ -339,7 +339,6 @@ source_set("impl") {
-       "//chrome/browser/actor/ui",
-       "//chrome/browser/desktop_to_mobile_promos:utils",
-       "//chrome/browser/device_identity",
--      "//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
-@@ -1605,9 +1605,6 @@ void RegisterLocalState(PrefRegistrySimp
+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
    DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
  #endif
  
@@ -587,9 +635,21 @@
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
    PlatformAuthPolicyObserver::RegisterPrefs(registry);
---- a/chrome/browser/profiles/BUILD.gn
-+++ b/chrome/browser/profiles/BUILD.gn
-@@ -525,7 +525,6 @@ source_set("profiles_extra_parts_impl")
+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")
    } else {
      deps += [
        "//chrome/browser/accessibility/phrase_segmentation",
@@ -597,17 +657,18 @@
        "//chrome/browser/accessibility_annotator/content_annotator",
        "//chrome/browser/apps/app_service",
        "//chrome/browser/autofill",
-@@ -540,7 +539,6 @@ source_set("profiles_extra_parts_impl")
-       "//chrome/browser/private_ai",
+@@ -801,7 +800,6 @@ source_set("profiles_extra_parts_impl")
        "//chrome/browser/profile_resetter",
        "//chrome/browser/record_replay",
+       "//chrome/browser/record_replay:impl",
 -      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
        "//chrome/browser/search",
        "//chrome/browser/search_engine_choice",
        "//chrome/browser/sharing_hub",
---- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -129,7 +129,6 @@
+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 @@
  #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"
@@ -615,7 +676,7 @@
  #include "chrome/browser/navigation_predictor/search_engine_preconnector.h"
  #include "chrome/browser/navigation_predictor/search_engine_preconnector_keyed_service_factory.h"
  #include "chrome/browser/net/dns_probe_service_factory.h"
-@@ -365,7 +364,6 @@
+@@ -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"
@@ -623,7 +684,7 @@
  #include "chrome/browser/search/instant_service_factory.h"
  #include "chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.h"
  #include "chrome/browser/speech/speech_recognition_client_browser_interface_factory.h"
-@@ -1122,7 +1120,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1138,7 +1136,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
    net::ServerCertificateDatabaseServiceFactory::GetInstance();
  #endif
@@ -631,8 +692,8 @@
  #if BUILDFLAG(ENABLE_DICE_SUPPORT)
    HistorySyncOptinServiceFactory::GetInstance();
    ProfileManagementDisclaimerServiceFactory::GetInstance();
-@@ -1169,9 +1166,6 @@ void ChromeBrowserMainExtraPartsProfiles
-   OneGoogleBarServiceFactory::GetInstance();
+@@ -1189,9 +1186,6 @@ void ChromeBrowserMainExtraPartsProfiles
+   // TODO(b/502297163): Implement for Android.
    OneTimePermissionsTrackerFactory::GetInstance();
  #endif
 -  if (optimization_guide::ShouldStartModelValidator()) {
@@ -641,7 +702,7 @@
    OptimizationGuideGlobalStateHolderKeyedServiceFactory::GetInstance();
    OptimizationGuideKeyedServiceFactory::GetInstance();
    OriginKeyedPermissionActionServiceFactory::GetInstance();
-@@ -1256,7 +1250,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1276,7 +1270,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
    policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
@@ -649,7 +710,7 @@
    PredictionServiceFactory::GetInstance();
    predictors::AutocompleteActionPredictorFactory::GetInstance();
    predictors::LoadingPredictorFactory::GetInstance();
-@@ -1333,10 +1326,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1355,10 +1348,6 @@ void ChromeBrowserMainExtraPartsProfiles
    SafetyHubMenuNotificationServiceFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
    SafetyHubHatsServiceFactory::GetInstance();
@@ -660,7 +721,7 @@
  #endif
  #if BUILDFLAG(IS_CHROMEOS)
    if (ash::features::IsScannerEnabled()) {
-@@ -1450,7 +1439,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1472,7 +1461,6 @@ void ChromeBrowserMainExtraPartsProfiles
    TopSitesFactory::GetInstance();
    translate::TranslateRankerFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
@@ -668,8 +729,9 @@
    TriggeredProfileResetterFactory::GetInstance();
  #endif
  #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
---- a/chrome/browser/profiles/off_the_record_profile_impl.cc
-+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
+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() {
    // AccessibilityLabelsService has a default prefs behavior in incognito.
    AccessibilityLabelsService::InitOffTheRecordPrefs(this);
@@ -682,9 +744,10 @@
  
    // The ad service might not be available for some irregular profiles, like the
    // System Profile.
---- a/chrome/browser/profiles/profile_impl.cc
-+++ b/chrome/browser/profiles/profile_impl.cc
-@@ -859,11 +859,6 @@ void ProfileImpl::DoFinalInit(CreateMode
+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
    // The password settings service needs to start listening to settings
    // changes from Google Mobile Services, as early as possible.
    PasswordManagerSettingsServiceFactory::GetForProfile(this);
@@ -696,8 +759,9 @@
  #endif  // BUILDFLAG(IS_ANDROID)
  
    // The announcement notification  service might not be available for some
---- a/chrome/browser/profiles/profile_manager.cc
-+++ b/chrome/browser/profiles/profile_manager.cc
+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
 @@ -51,7 +51,6 @@
  #include "chrome/browser/buildflags.h"
  #include "chrome/browser/lifetime/application_lifetime.h"
@@ -716,8 +780,9 @@
    IdentityManagerFactory::GetForProfile(profile)->OnNetworkInitialized();
    AccountReconcilorFactory::GetForProfile(profile);
  #if BUILDFLAG(IS_ANDROID)
---- a/chrome/browser/resources/pdf/pdf_viewer.html
-+++ b/chrome/browser/resources/pdf/pdf_viewer.html
+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
        </cr-page-selector>
      ` : ''}
@@ -729,8 +794,9 @@
  </div>
  
  ${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
---- a/chrome/browser/skills/BUILD.gn
-+++ b/chrome/browser/skills/BUILD.gn
+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") {
  source_set("ui") {
    sources = [
@@ -745,18 +811,19 @@
        "skills_ui_window_controller.cc",
      ]
    }
---- a/chrome/browser/ui/BUILD.gn
-+++ b/chrome/browser/ui/BUILD.gn
-@@ -1595,8 +1595,6 @@ static_library("ui") {
+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") {
        "//chrome/browser/regional_capabilities",
        "//chrome/browser/safe_browsing",
        "//chrome/browser/safe_browsing:advanced_protection",
 -      "//chrome/browser/screen_ai:screen_ai_install_state",
 -      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
        "//chrome/browser/smart_card",
+       "//chrome/browser/support_tool",
        "//chrome/browser/tab_group_sync:utils",
-       "//chrome/browser/themes",
-@@ -2414,7 +2412,6 @@ static_library("ui") {
+@@ -2600,7 +2598,6 @@ static_library("ui") {
        "//chrome/browser/policy:onc",
        "//chrome/browser/policy:system_features_disable_list",
        "//chrome/browser/push_notification",
@@ -764,7 +831,7 @@
        "//chrome/browser/ui/ash/app_access",
        "//chrome/browser/ui/ash/arc",
        "//chrome/browser/ui/ash/arc/arc_app_dialog_view",
-@@ -4912,7 +4909,6 @@ static_library("ui") {
+@@ -5031,7 +5028,6 @@ static_library("ui") {
        "//chrome/browser/ui/waap:waap_utils",
        "//chrome/browser/ui/webauthn:impl",
        "//chrome/browser/ui/webui/app_service_internals",
@@ -772,8 +839,9 @@
        "//chrome/browser/ui/webui/content_annotator_internals",
        "//chrome/browser/ui/webui/side_panel/customize_chrome",
        "//chrome/browser/ui/window_name_prompt",
---- a/chrome/browser/ui/pdf/BUILD.gn
-+++ b/chrome/browser/ui/pdf/BUILD.gn
+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
 @@ -6,7 +6,6 @@ import("//pdf/features.gni")
  import("//services/screen_ai/buildflags/features.gni")
  
@@ -790,9 +858,10 @@
      "//chrome/browser/ui/tab_contents",
      "//chrome/browser/ui/user_education",
      "//chrome/common",
---- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
-+++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
-@@ -147,22 +147,3 @@ void ChromePDFDocumentHelperClient::SetP
+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
+@@ -146,22 +146,3 @@ void ChromePDFDocumentHelperClient::SetP
    }
  }
  
@@ -815,8 +884,9 @@
 -  tab_subscriptions_.push_back(tab->RegisterWillDeactivate(
 -      base::BindRepeating(&MaybeHideSearchifyFeaturePromo)));
 -}
---- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h
-+++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h
+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
 @@ -27,7 +27,6 @@ class ChromePDFDocumentHelperClient : pu
    void OnSaveURL() override;
    void SetPluginCanSave(content::RenderFrameHost* render_frame_host,
@@ -825,9 +895,10 @@
  
    // Holds subscriptions for TabInterface callbacks.
    std::vector<base::CallbackListSubscription> tab_subscriptions_;
---- a/chrome/browser/ui/tabs/tab_features.cc
-+++ b/chrome/browser/ui/tabs/tab_features.cc
-@@ -394,11 +394,6 @@ void TabFeatures::Init(TabInterface& tab
+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);
  
@@ -839,7 +910,7 @@
  
      if (accessibility_annotator::
              ContentAnnotatorService* content_annotator_service =
-@@ -574,10 +569,6 @@ void TabFeatures::Init(TabInterface& tab
+@@ -584,10 +579,6 @@ void TabFeatures::Init(TabInterface& tab
  #endif
  
  #if !BUILDFLAG(IS_ANDROID)
@@ -850,9 +921,10 @@
    if (base::FeatureList::IsEnabled(features::kIndigo)) {
      indigo_page_action_controller_ =
          std::make_unique<indigo::IndigoPageActionController>(
---- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
-+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
-@@ -907,40 +907,6 @@ void MaybeRegisterChromeFeaturePromos(
+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(
                         "Triggered when the PDF Viewer opens.")));
  #endif
  
@@ -893,28 +965,31 @@
  
    // kIPHLensOverlayFeature:
    registry.RegisterFeature(std::move(
---- a/chrome/browser/ui/webui/BUILD.gn
-+++ b/chrome/browser/ui/webui/BUILD.gn
-@@ -78,7 +78,6 @@ source_set("configs") {
-       "//chrome/browser/glic/selection",
+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") {
        "//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",
---- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
-+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -324,7 +324,6 @@ void RegisterChromeWebUIConfigs() {
-           content_annotator_internals::ContentAnnotatorInternalsUIConfig>());
+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>());
    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<media_router::AccessCodeCastUIConfig>());
    map.AddWebUIConfig(std::make_unique<BookmarksSidePanelUIConfig>());
    map.AddWebUIConfig(std::make_unique<BookmarksUIConfig>());
---- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
-+++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
+   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
 @@ -35,11 +35,6 @@ void AccessibilityMainHandler::RegisterM
        base::BindRepeating(
            &AccessibilityMainHandler::HandleCheckAccessibilityImageLabels,
@@ -975,8 +1050,9 @@
  }
  
  void AccessibilityMainHandler::HandleGetScreenReaderState(
---- a/chrome/browser/ui/webui/settings/accessibility_main_handler.h
-+++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.h
+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
 @@ -19,8 +19,7 @@ namespace settings {
  // Settings handler for the main accessibility settings page,
  // chrome://settings/accessibility.
@@ -1007,8 +1083,9 @@
  };
  
  }  // namespace settings
---- 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
+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
 @@ -24,8 +24,6 @@
  #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
  #include "chrome/browser/language/language_model_manager_factory.h"
@@ -1017,8 +1094,8 @@
 -#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
  #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
  #include "chrome/browser/translate/chrome_translate_client.h"
- #include "chrome/browser/ui/browser.h"
-@@ -430,14 +428,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
+ #include "chrome/browser/ui/read_anything/read_anything_controller.h"
+@@ -431,14 +429,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
    prefs_lang = language::ExtractBaseLanguage(prefs_lang);
    SetDefaultLanguageCode(prefs_lang);
  
@@ -1033,9 +1110,10 @@
  
    if (features::IsReadAnythingWithReadabilityEnabled() &&
        !features::IsReadAnythingReadAloudPhraseHighlightingEnabled()) {
---- a/chrome/renderer/BUILD.gn
-+++ b/chrome/renderer/BUILD.gn
-@@ -355,8 +355,6 @@ static_library("renderer") {
+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") {
      ]
    } else {
      sources += [
@@ -1044,7 +1122,7 @@
        "accessibility/phrase_segmentation/base_phrase_segmenter.cc",
        "accessibility/phrase_segmentation/base_phrase_segmenter.h",
        "accessibility/phrase_segmentation/dependency_parser_model.cc",
-@@ -373,16 +371,6 @@ static_library("renderer") {
+@@ -367,16 +365,6 @@ static_library("renderer") {
        "accessibility/phrase_segmentation/tokenized_sentence.h",
        "accessibility/phrase_segmentation/tokenizer.cc",
        "accessibility/phrase_segmentation/tokenizer.h",
@@ -1061,17 +1139,18 @@
        "media/chrome_speech_recognition_client.cc",
        "media/chrome_speech_recognition_client.h",
        "searchbox/searchbox.cc",
-@@ -399,7 +387,6 @@ static_library("renderer") {
-       "//components/crx_file",
+@@ -392,7 +380,6 @@ static_library("renderer") {
+       "//components/record_replay/content/renderer",
        "//components/trusted_vault",
        "//services/screen_ai/buildflags",
 -      "//services/screen_ai/public/mojom",
        "//services/strings",
        "//third_party/re2",
        "//third_party/tensorflow-text",
---- a/chrome/renderer/chrome_render_frame_observer.cc
-+++ b/chrome/renderer/chrome_render_frame_observer.cc
-@@ -77,7 +77,6 @@
+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 @@
  #include "url/gurl.h"
  
  #if !BUILDFLAG(IS_ANDROID)
@@ -1079,7 +1158,7 @@
  #include "chrome/renderer/searchbox/searchbox_extension.h"
  #endif  // !BUILDFLAG(IS_ANDROID)
  
-@@ -340,14 +339,6 @@ void ChromeRenderFrameObserver::DidClear
+@@ -341,14 +340,6 @@ void ChromeRenderFrameObserver::DidClear
      SearchBoxExtension::Install(render_frame()->GetWebFrame());
    }
  
@@ -1094,19 +1173,20 @@
  #endif  // !BUILDFLAG(IS_ANDROID)
  #if BUILDFLAG(ENABLE_GUEST_VIEW) && !BUILDFLAG(ENABLE_EXTENSIONS_CORE)
    guest_view::SlimWebViewBindings::MaybeInstall(*render_frame());
---- a/chrome/test/BUILD.gn
-+++ b/chrome/test/BUILD.gn
-@@ -2736,9 +2736,6 @@ if (!is_android) {
+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) {
        "//chrome/browser/resource_coordinator:mojo_bindings",
        "//chrome/browser/safe_browsing:advanced_protection",
        "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
+-      "//chrome/browser/screen_ai:browser_tests",
 -      "//chrome/browser/screen_ai:screen_ai_install_state",
 -      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
--      "//chrome/browser/screen_ai/public:test_support",
        "//chrome/browser/search",
        "//chrome/browser/search_engines",
        "//chrome/browser/segmentation_platform:test_utils",
-@@ -3228,8 +3225,6 @@ if (!is_android) {
+@@ -3330,8 +3327,6 @@ if (!is_android) {
        "//services/preferences/public/cpp",
        "//services/preferences/public/cpp/tracked",
        "//services/preferences/tracked:features",
@@ -1115,7 +1195,7 @@
        "//services/service_manager/public/cpp",
        "//services/strings",
        "//services/test/echo/public/mojom",
-@@ -8769,7 +8764,6 @@ test("unit_tests") {
+@@ -8772,7 +8767,6 @@ test("unit_tests") {
      #
      # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
      deps += [
@@ -1123,7 +1203,7 @@
        "//chrome:packed_resources",
        "//chrome/browser/apps:icon_standardizer",
        "//chrome/browser/apps/app_service",
-@@ -8806,7 +8800,6 @@ test("unit_tests") {
+@@ -8810,7 +8804,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",
@@ -1131,8 +1211,9 @@
        "//chrome/browser/search/background",
        "//chrome/browser/search/background:constants",
        "//chrome/browser/search_engine_choice:unit_tests",
---- a/chrome/utility/BUILD.gn
-+++ b/chrome/utility/BUILD.gn
+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
 @@ -147,7 +147,6 @@ static_library("utility") {
        "//components/user_data_importer/content",
        "//components/user_data_importer/utility:bookmarks",
@@ -1141,8 +1222,9 @@
      ]
    }
  
---- a/chrome/utility/services.cc
-+++ b/chrome/utility/services.cc
+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
 @@ -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
@@ -1173,18 +1255,9 @@
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
---- a/components/BUILD.gn
-+++ b/components/BUILD.gn
-@@ -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",
---- a/components/autofill/core/browser/autofill_field.cc
-+++ b/components/autofill/core/browser/autofill_field.cc
+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"
@@ -1193,8 +1266,9 @@
  #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"
---- a/components/autofill/core/browser/foundations/autofill_manager.cc
-+++ b/components/autofill/core/browser/foundations/autofill_manager.cc
+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 {
  
    std::vector<FormData> forms;
@@ -1215,7 +1289,7 @@
              break;
            case HeuristicSource::kRegexes:
              NOTREACHED();
-@@ -1043,12 +1039,6 @@ void AutofillManager::UpdateFormCache(
+@@ -1046,12 +1042,6 @@ void AutofillManager::UpdateFormCache(
  
    auto apply_predictions = [](FormStructure& form_structure,
                                const AsyncContext& context, size_t i) {
@@ -1228,7 +1302,7 @@
      if (!context.regex_predictions.empty()) {
        context.regex_predictions[i].ApplyTo(form_structure.fields());
      }
-@@ -1166,26 +1156,6 @@ void AutofillManager::LogCurrentFieldTyp
+@@ -1169,26 +1159,6 @@ void AutofillManager::LogCurrentFieldTyp
  
  void AutofillManager::SubscribeToMlModelChanges(
      FieldClassificationModelHandler& handler) {
@@ -1255,8 +1329,20 @@
  }
  
  }  // namespace autofill
---- a/components/page_content_annotations/content/BUILD.gn
-+++ b/components/page_content_annotations/content/BUILD.gn
+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") {
    sources = [
      "embeddings_candidate_generator.cc",
@@ -1266,8 +1352,9 @@
      "page_embeddings_service.cc",
      "page_embeddings_service.h",
    ]
---- a/components/pdf/renderer/pdf_view_web_plugin_client.h
-+++ b/components/pdf/renderer/pdf_view_web_plugin_client.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
 @@ -12,7 +12,6 @@
  #include "base/memory/weak_ptr.h"
  #include "mojo/public/cpp/bindings/remote.h"
@@ -1285,9 +1372,22 @@
  
    base::WeakPtrFactory<PdfViewWebPluginClient> weak_factory_{this};
  };
---- a/services/screen_ai/buildflags/features.gni
-+++ b/services/screen_ai/buildflags/features.gni
-@@ -6,14 +6,13 @@ import("//build/config/sanitizers/saniti
+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
+@@ -6,15 +6,13 @@ import("//build/config/sanitizers/saniti
  
  declare_args() {
    # Screen AI service is only supported on desktop platforms.
@@ -1297,7 +1397,8 @@
    # Screen AI library is not available for browser tests on ChromeOS. Tast tests
    # cover library's OCR functionality on ChromeOS.
    enable_screen_ai_browsertests =
--      is_linux || (is_mac && (target_cpu == "arm64" || target_cpu == "x64")) ||
+-      (is_linux && target_cpu == "x64") ||
+-      (is_mac && (target_cpu == "arm64" || target_cpu == "x64")) ||
 -      (is_win && (target_cpu == "x64" || target_cpu == "x86"))
 +      false
  

diff --git a/sources b/sources
index c8446af..8c580bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (node-v22.22.0-stripped.tar.gz) = f32a8a73063b3c78cbacf941e11dd529ebcf2618b3ba661966312e49ee9870c43a3acf256e8d331a4b0b621b16a501810c02a3ad763c75884cc250addca8e106
-SHA512 (chromium-148.0.7778.215-clean.tar.xz) = 1453154f676201ec088f2c3f523f9f55dc984d5585e54b67a905f05e7ebda827834c739398f40b6432d3be1d14d09280808eafbafa0d8301dffb3c6eb56485f5
+SHA512 (chromium-149.0.7827.53-clean.tar.xz) = 27499aa9f6adbaefabe5a61168157286c6fb3d53415a9b76bf7b6ce9a361621a6afd301e8a9d796a14ffc8cefc7d0bf3f660e4595013503ae09be077d24be230

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

only message in thread, other threads:[~2026-06-05 14:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-05 14:19 [rpms/chromium] epel10: - Update to 149.0.7827.53 Than Ngo

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