Consolidating executor runners in CMake - xnnpack

Continuing the process of consolidating the executor runners to top
level CMakeLists.txt file. Completing this process for the xnnpack
backend. Change also updates the CI tests to not use the generic
executor_runner and removes the specific xnn_executor_runner.

Author: BujSet

.ci/scripts/test_model.sh

@@ -111,19 +111,6 @@ test_model() {
   run_portable_executor_runner
 }
 
-build_cmake_xnn_executor_runner() {
-  echo "Building xnn_executor_runner"
-
-  (rm -rf ${CMAKE_OUTPUT_DIR} \
-    && mkdir ${CMAKE_OUTPUT_DIR} \
-    && cd ${CMAKE_OUTPUT_DIR} \
-    && retry cmake -DCMAKE_BUILD_TYPE=Release \
-      -DEXECUTORCH_BUILD_XNNPACK=ON \
-      -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" ..)
-
-  cmake --build ${CMAKE_OUTPUT_DIR} -j4
-}
-
 test_model_with_xnnpack() {
   WITH_QUANTIZATION=$1
   WITH_DELEGATION=$2
@@ -150,10 +137,10 @@ test_model_with_xnnpack() {
   if [[ "${BUILD_TOOL}" == "buck2" ]]; then
     buck2 run //examples/xnnpack:xnn_executor_runner -- --model_path "${OUTPUT_MODEL_PATH}"
   elif [[ "${BUILD_TOOL}" == "cmake" ]]; then
-    if [[ ! -f ${CMAKE_OUTPUT_DIR}/backends/xnnpack/xnn_executor_runner ]]; then
-      build_cmake_xnn_executor_runner
+    if [[ ! -f ${CMAKE_OUTPUT_DIR}/executor_runner ]]; then
+      build_cmake_executor_runner
     fi
-    ./${CMAKE_OUTPUT_DIR}/backends/xnnpack/xnn_executor_runner --model_path "${OUTPUT_MODEL_PATH}"
+    ./${CMAKE_OUTPUT_DIR}/executor_runner --model_path "${OUTPUT_MODEL_PATH}"
   else
     echo "Invalid build tool ${BUILD_TOOL}. Only buck2 and cmake are supported atm"
     exit 1

backends/openvino/CMakeLists.txt

@@ -51,7 +51,7 @@ target_link_options_shared_lib(openvino_backend)
 if(EXECUTORCH_BUILD_OPENVINO_EXECUTOR_RUNNER)
     # Build executor runner binary for openvino backend
     list(APPEND openvino_executor_runner_libs openvino_backend executorch)
-    
+
     set(_openvino_executor_runner__srcs
         ${EXECUTORCH_ROOT}/examples/portable/executor_runner/executor_runner.cpp
         ${EXECUTORCH_ROOT}/extension/data_loader/file_data_loader.cpp
@@ -60,9 +60,9 @@ if(EXECUTORCH_BUILD_OPENVINO_EXECUTOR_RUNNER)
         ${EXECUTORCH_ROOT}/extension/runner_util/inputs_portable.cpp
         )
     add_executable(openvino_executor_runner ${_openvino_executor_runner__srcs})
-    
+
     list(APPEND openvino_executor_runner_libs)
-    
+
     target_link_libraries(
       openvino_executor_runner gflags portable_ops_lib ${openvino_executor_runner_libs}
     )

backends/xnnpack/CMakeLists.txt

@@ -114,22 +114,6 @@ target_include_directories(
 target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})
 target_link_options_shared_lib(xnnpack_backend)
 
-if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
-  list(APPEND xnn_executor_runner_libs optimized_native_cpu_ops_lib)
-else()
-  list(APPEND xnn_executor_runner_libs portable_ops_lib)
-endif()
-
-if(EXECUTORCH_BUILD_KERNELS_CUSTOM)
-  list(APPEND xnn_executor_runner_libs $<LINK_LIBRARY:WHOLE_ARCHIVE,custom_ops>)
-endif()
-
-if(EXECUTORCH_BUILD_KERNELS_QUANTIZED)
-  list(APPEND xnn_executor_runner_libs quantized_ops_lib)
-endif()
-
-list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)
-
 # ios can only build library but not binary
 if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
   #
@@ -139,11 +123,6 @@ if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
   list(TRANSFORM _xnn_executor_runner__srcs PREPEND "${EXECUTORCH_ROOT}/")
   add_executable(xnn_executor_runner ${_xnn_executor_runner__srcs})
 
-  if(EXECUTORCH_ENABLE_EVENT_TRACER)
-    list(APPEND xnn_executor_runner_libs etdump)
-  endif()
-
-  target_link_libraries(xnn_executor_runner gflags ${xnn_executor_runner_libs})
   target_compile_options(xnn_executor_runner PUBLIC ${_common_compile_options})
   if(EXECUTORCH_BUILD_PTHREADPOOL)
     target_link_libraries(xnn_executor_runner extension_threadpool pthreadpool)
@@ -153,7 +132,6 @@ endif()
 
 install(
   TARGETS xnnpack_backend
-  DESTINATION lib
   INCLUDES
   DESTINATION ${_common_include_directories}
 )