Update XNNPACK to CMake Fix (#11856)

Author: mcr229

CMakeLists.txt

@@ -606,9 +606,9 @@ if(EXECUTORCH_BUILD_PYBIND)
   endif()
 
   if(EXECUTORCH_BUILD_XNNPACK)
-    # need to explicitly specify XNNPACK and microkernels-prod here otherwise
+    # need to explicitly specify XNNPACK and xnnpack-microkernels-prod here otherwise
     # uses XNNPACK and microkernel-prod symbols from libtorch_cpu
-    list(APPEND _dep_libs xnnpack_backend XNNPACK microkernels-prod)
+    list(APPEND _dep_libs xnnpack_backend XNNPACK xnnpack-microkernels-prod)
   endif()
 
   # compile options for pybind

backends/xnnpack/cmake/Dependencies.cmake

@@ -61,7 +61,7 @@ set(XNNPACK_BUILD_ALL_MICROKERNELS
 add_subdirectory("${XNNPACK_SOURCE_DIR}")
 include_directories(SYSTEM ${XNNPACK_INCLUDE_DIR})
 list(APPEND xnnpack_third_party XNNPACK)
-install(TARGETS microkernels-prod
+install(TARGETS xnnpack-microkernels-prod
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

backends/xnnpack/test/CMakeLists.txt

@@ -32,7 +32,7 @@ et_cxx_test(
   XNNPACK
   pthreadpool
   cpuinfo
-  microkernels-prod
+  xnnpack-microkernels-prod
 )
 target_include_directories(
   backends_xnnpack_test

backends/xnnpack/test/runtime/test_xnnexecutor.cpp

@@ -56,7 +56,7 @@ TEST(XNNExecutorTest, ArgumentWithTooManyDimensions) {
           dims.size(),
           dims.data(),
           nullptr,
-          /*external_id=*/0,
+          /*external_id=*/1,
           /*flags=*/XNN_VALUE_FLAG_EXTERNAL_OUTPUT,
           &output_id));
   ASSERT_NE(output_id, XNN_INVALID_VALUE_ID);

backends/xnnpack/third-party/XNNPACK

@@ -1078,6 +1078,7 @@ def define_xnnpack():
             "XNNPACK/src/microkernel-utils.c",
             "XNNPACK/src/reference/binary-elementwise.cc",
             "XNNPACK/src/reference/unary-elementwise.cc",
+            "XNNPACK/src/pack-lh.cc",
         ],
         headers = get_xnnpack_headers(),
         exported_headers = {
@@ -1099,6 +1100,7 @@ def define_xnnpack():
             # "-DXNN_ENABLE_DWCONV_MULTIPLASS=1",
             "-DXNN_ENABLE_ARM_I8MM=1",
             "-DXNN_ENABLE_ARM_FP16_VECTOR=1",
+            "-DXNN_ENABLE_AVX512BF16=0"
         ],
         visibility = ["PUBLIC"],
         exported_deps = COMMON_XNNPACK_DEPS + [

backends/xnnpack/third-party/xnnpack.buck.bzl

@@ -4,11 +4,37 @@ load(
     _OPERATOR_SRCS = "OPERATOR_SRCS",
     _SUBGRAPH_SRCS = "SUBGRAPH_SRCS",
     _TABLE_SRCS = "TABLE_SRCS",
-    _XNNPACK_SRCS = "XNNPACK_SRCS",
 )
 load("//backends/xnnpack/third-party/XNNPACK/gen:microkernels.bzl", "prod_srcs_for_arch")
 load("@fbsource//xplat/executorch/third-party:glob_defs.bzl", "subdir_glob")
 
+# To get from XNNPACK:build_srcs.bzl in the future
+_XNNPACK_SRCS = [
+    "src/configs/argmaxpool-config.c",
+    "src/configs/avgpool-config.c",
+    "src/configs/binary-elementwise-config.c",
+    "src/configs/cmul-config.c",
+    "src/configs/conv-hwc2chw-config.c",
+    "src/configs/dwconv-config.c",
+    "src/configs/dwconv2d-chw-config.c",
+    "src/configs/gemm-config.c",
+    "src/configs/ibilinear-chw-config.c",
+    "src/configs/ibilinear-config.c",
+    "src/configs/lut32norm-config.c",
+    "src/configs/maxpool-config.c",
+    "src/configs/pack-lh-config.c",
+    "src/configs/raddstoreexpminusmax-config.c",
+    "src/configs/reduce-config.c",
+    "src/configs/spmm-config.c",
+    "src/configs/transpose-config.c",
+    "src/configs/unary-elementwise-config.c",
+    "src/configs/unpool-config.c",
+    "src/configs/vmulcaddc-config.c",
+    "src/configs/x8-lut-config.c",
+    "src/configs/xx-fill-config.c",
+    "src/configs/xx-pad-config.c",
+]
+
 def define_xnnpack_build_src(xnnpack_build_src):
     return ["XNNPACK/{}".format(src) for src in xnnpack_build_src]
 
@@ -18,13 +44,17 @@ def prod_srcs_for_arch_wrapper(arch):
 
 def get_xnnpack_headers():
     src_headers = subdir_glob([
-        ("XNNPACK/src", "**/*.h"),
+        ("XNNPACK", "src/xnnpack/*.h"),
+        ("XNNPACK", "src/xnnpack/**/*.h"),
+        ("XNNPACK", "src/**/*.h"),
     ])
     include_headers = subdir_glob([
-        ("XNNPACK/include", "*.h"),
+        ("XNNPACK", "include/*.h"),
     ])
-
-    return src_headers | include_headers
+    ukernel_headers = subdir_glob([
+        ("XNNPACK", "src/**/*.inc"),
+    ])
+    return src_headers | include_headers | ukernel_headers
 
 OPERATOR_SRCS = define_xnnpack_build_src(_OPERATOR_SRCS)
 SUBGRAPH_SRCS = define_xnnpack_build_src(_SUBGRAPH_SRCS)

backends/xnnpack/third-party/xnnpack_src_defs.bzl

@@ -155,7 +155,7 @@ endif()
 
 # XNNPACK
 if(TARGET xnnpack_backend)
-  set(xnnpack_backend_libs xnnpack_backend XNNPACK microkernels-prod)
+  set(xnnpack_backend_libs xnnpack_backend XNNPACK xnnpack-microkernels-prod)
   if(TARGET kleidiai)
     list(APPEND xnnpack_backend_libs kleidiai)
   endif()

examples/models/llama/CMakeLists.txt

@@ -130,7 +130,7 @@ endif()
 
 # XNNPACK
 if(TARGET xnnpack_backend)
-  set(xnnpack_backend_libs xnnpack_backend XNNPACK microkernels-prod)
+  set(xnnpack_backend_libs xnnpack_backend XNNPACK xnnpack-microkernels-prod)
   if(TARGET kleidiai)
     list(APPEND xnnpack_backend_libs kleidiai)
   endif()

examples/models/llava/CMakeLists.txt

@@ -113,7 +113,7 @@ endif()
 
 if(TARGET xnnpack_backend)
   target_link_options_shared_lib(xnnpack_backend)
-  list(APPEND link_libraries xnnpack_backend XNNPACK pthreadpool cpuinfo microkernels-prod)
+  list(APPEND link_libraries xnnpack_backend XNNPACK pthreadpool cpuinfo xnnpack-microkernels-prod)
 endif()
 
 if(TARGET vulkan_backend)