[xnnpack] update to 2024-04-11

ports/xnnpack/fix-cmake.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2e7f753..b33f03d 100644
+index e0d2a3634..f07f37524 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -14,7 +14,7 @@ CMAKE_POLICY(SET CMP0091 NEW)
+@@ -17,7 +17,7 @@ CMAKE_POLICY(SET CMP0091 NEW)
  # ---[ Project and semantic versioning.
  PROJECT(XNNPACK C CXX ASM)
 
@@ -11,7 +11,7 @@ index 2e7f753..b33f03d 100644
  SET(CMAKE_C_EXTENSIONS NO)
  SET(CMAKE_CXX_STANDARD 14)
  SET(CMAKE_CXX_STANDARD_REQUIRED YES)
-@@ -118,7 +118,7 @@ ENDIF()
+@@ -171,7 +171,7 @@ ENDIF()
  # ---[ Build flags
  IF(NOT CMAKE_SYSTEM_NAME)
    MESSAGE(FATAL_ERROR "CMAKE_SYSTEM_NAME not defined")
@@ -20,7 +20,7 @@ index 2e7f753..b33f03d 100644
    MESSAGE(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_NAME value \"${CMAKE_SYSTEM_NAME}\"")
  ENDIF()
  IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-@@ -785,7 +785,7 @@ TARGET_INCLUDE_DIRECTORIES(normalization PRIVATE include src)
+@@ -930,7 +930,7 @@ TARGET_INCLUDE_DIRECTORIES(normalization PRIVATE include src)
  TARGET_INCLUDE_DIRECTORIES(packing PRIVATE include src)
  TARGET_INCLUDE_DIRECTORIES(logging PRIVATE include src)
  IF(XNNPACK_BUILD_LIBRARY)
@@ -29,7 +29,18 @@ index 2e7f753..b33f03d 100644
    TARGET_INCLUDE_DIRECTORIES(XNNPACK PRIVATE src)
    TARGET_INCLUDE_DIRECTORIES(allocator PRIVATE include src)
    TARGET_INCLUDE_DIRECTORIES(cache PRIVATE include src)
-@@ -818,7 +818,9 @@ IF(LIBM)
+@@ -942,6 +942,10 @@ IF(XNNPACK_BUILD_LIBRARY)
+   TARGET_INCLUDE_DIRECTORIES(memory PRIVATE include src)
+   TARGET_INCLUDE_DIRECTORIES(mutex PRIVATE include src)
+   TARGET_INCLUDE_DIRECTORIES(post-operation PUBLIC include src)
++  if(ANDROID)
++    find_library(LOG_LIB NAMES log REQUIRED)
++    target_link_libraries(XNNPACK PRIVATE log)
++  endif()
+   IF(WIN32)
+     # Target Windows 7+ API
+     TARGET_COMPILE_DEFINITIONS(XNNPACK PRIVATE _WIN32_WINNT=0x0601)
+@@ -965,7 +969,9 @@ IF(LIBM)
  ENDIF()
 
  # ---[ Configure cpuinfo
@@ -40,7 +51,7 @@ index 2e7f753..b33f03d 100644
    IF(NOT XNNPACK_USE_SYSTEM_LIBS)
      SET(CPUINFO_BUILD_TOOLS OFF CACHE BOOL "")
      SET(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "")
-@@ -843,7 +845,10 @@ IF(XNNPACK_BUILD_LIBRARY)
+@@ -991,7 +997,10 @@ IF(XNNPACK_BUILD_LIBRARY)
  ENDIF()
 
  # ---[ Configure pthreadpool
@@ -52,7 +63,7 @@ index 2e7f753..b33f03d 100644
    IF(NOT XNNPACK_USE_SYSTEM_LIBS)
      SET(PTHREADPOOL_BUILD_TESTS OFF CACHE BOOL "")
      SET(PTHREADPOOL_BUILD_BENCHMARKS OFF CACHE BOOL "")
-@@ -871,7 +875,9 @@ TARGET_LINK_LIBRARIES(microparams-init PRIVATE pthreadpool)
+@@ -1024,7 +1033,9 @@ TARGET_LINK_LIBRARIES(microparams-init PRIVATE pthreadpool)
  TARGET_LINK_LIBRARIES(normalization PRIVATE pthreadpool)
  TARGET_LINK_LIBRARIES(packing PRIVATE pthreadpool)
  IF(XNNPACK_BUILD_LIBRARY)
@@ -63,7 +74,7 @@ index 2e7f753..b33f03d 100644
    TARGET_LINK_LIBRARIES(allocator PRIVATE pthreadpool)
    TARGET_LINK_LIBRARIES(cache PRIVATE memory pthreadpool)
    TARGET_LINK_LIBRARIES(subgraph PRIVATE pthreadpool)
-@@ -884,7 +888,10 @@ IF(XNNPACK_BUILD_LIBRARY)
+@@ -1037,7 +1048,10 @@ IF(XNNPACK_BUILD_LIBRARY)
  ENDIF()
 
  # ---[ Configure FXdiv
@@ -75,7 +86,7 @@ index 2e7f753..b33f03d 100644
    IF(NOT XNNPACK_USE_SYSTEM_LIBS)
      SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
      SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
-@@ -908,7 +915,10 @@ IF(XNNPACK_BUILD_LIBRARY)
+@@ -1064,7 +1078,10 @@ IF(XNNPACK_BUILD_LIBRARY)
  ENDIF()
 
  # ---[ Configure FP16
@@ -87,7 +98,7 @@ index 2e7f753..b33f03d 100644
    IF(NOT XNNPACK_USE_SYSTEM_LIBS)
      SET(FP16_BUILD_TESTS OFF CACHE BOOL "")
      SET(FP16_BUILD_BENCHMARKS OFF CACHE BOOL "")
-@@ -939,6 +949,13 @@ IF(XNNPACK_BUILD_LIBRARY)
+@@ -1098,6 +1115,13 @@ IF(XNNPACK_BUILD_LIBRARY)
        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
@@ -101,18 +112,3 @@ index 2e7f753..b33f03d 100644
  ENDIF()
 
  # ---[ XNNPACK unit tests
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0f0d9d3..658d310 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -797,6 +797,10 @@ IF(XNNPACK_BUILD_LIBRARY)
-   TARGET_INCLUDE_DIRECTORIES(memory PRIVATE include src)
-   TARGET_INCLUDE_DIRECTORIES(mutex PRIVATE include src)
-   TARGET_INCLUDE_DIRECTORIES(post-operation PUBLIC include src)
-+  if(ANDROID)
-+    find_library(LOG_LIB NAMES log REQUIRED)
-+    target_link_libraries(XNNPACK PRIVATE log)
-+  endif()
-   IF(WIN32)
-     # Target Windows 7+ API
-     TARGET_COMPILE_DEFINITIONS(XNNPACK PRIVATE _WIN32_WINNT=0x0601)

ports/xnnpack/portfile.cmake

@@ -7,8 +7,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/XNNPACK
-    REF 0ec73cadf48e65152e25e56b1d19add9ced75e57 # 2023-11-17
-    SHA512 926b18aa253c2b656ff25cf23bc7646229cbd1c0a522b0e1367b377876899f60e9322416e02b9d543e8426d44a1143ee8f4b7dc2d4bce47a6f3a7a3ca7b4f86c
+    REF fab87547a2082668ea5bfe968a2586cd96529e61 # 2024-04-11
+    SHA512 96453e4c54463374d255b354b3f1b10870d6807d30cb354bca597eb96c75b49c04c841b1e4d06f6a3c61232235a7095cd4f8a18de91df118996d5c00853d4edc
     HEAD_REF master
     PATCHES
         fix-cmake.patch
@@ -35,9 +35,9 @@ if(VCPKG_TARGET_IS_WINDOWS)
     # see also: https://docs.microsoft.com/en-us/cpp/intrinsics/arm64-intrinsics?view=msvc-170
     if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
         list(APPEND PLATFORM_OPTIONS
-            -DXNNPACK_ENABLE_ARM_FP16=OFF # `__fp16` type is missing
             -DXNNPACK_ENABLE_ARM_BF16=OFF # `bfloat16_t` type is missing
-            -DXNNPACK_ENABLE_ARM_FP16_SCALAR=OFF
+            -DXNNPACK_ENABLE_ARM_FP16_SCALAR=OFF # 'arm_fp16.h': No such file or directory
+            -DXNNPACK_ENABLE_ARM_FP16_VECTOR=ON
             -DXNNPACK_ENABLE_ARM_DOTPROD=OFF
         )
     endif()
@@ -62,6 +62,7 @@ endif()
 set(USE_ASSEMBLY true)
 if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE MATCHES "arm"))
     set(USE_ASSEMBLY false)
+    # more detailed option for .S files?
 endif()
 
 vcpkg_cmake_configure(

ports/xnnpack/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "xnnpack",
-  "version-date": "2023-11-16",
-  "port-version": 1,
+  "version-date": "2024-04-11",
   "description": "High-efficiency floating-point neural network inference operators for mobile, server, and Web",
   "homepage": "https://github.com/google/XNNPACK",
   "dependencies": [