Adding cmakelist changes to link nnlib

CMakeLists.txt

@@ -417,7 +417,7 @@ target_link_libraries(executorch_no_prim_ops PRIVATE program_schema)
 # Check if dl exists for this toolchain and only then link it.
 find_library(DL_LIBRARY_EXISTS NAMES dl)
 # Check if the library was found
-if(DL_LIBRARY_EXISTS)
+if(DL_LIBRARY_EXISTS AND NOT EXECUTORCH_BUILD_CADENCE)
   target_link_libraries(executorch_no_prim_ops PRIVATE dl) # For dladdr()
 endif()
 target_include_directories(
@@ -443,7 +443,9 @@ target_link_options_shared_lib(executorch)
 # Real integrations should supply their own YAML file that only lists the
 # operators necessary for the models that will run.
 #
+if(NOT EXECUTORCH_BUILD_CADENCE)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/kernels/portable)
+endif()
 
 if(EXECUTORCH_BUILD_KERNELS_CUSTOM)
   # TODO: move all custom kernels to ${CMAKE_CURRENT_SOURCE_DIR}/kernels/custom
@@ -496,6 +498,8 @@ if(EXECUTORCH_BUILD_EXECUTOR_RUNNER)
 
   if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
     list(APPEND _executor_runner_libs optimized_native_cpu_ops_lib)
+  elseif(EXECUTORCH_BUILD_CADENCE)
+    list(APPEND _executor_runner_libs cadence_ops_lib)
   else()
     list(APPEND _executor_runner_libs portable_ops_lib)
   endif()
@@ -566,6 +570,10 @@ if(EXECUTORCH_BUILD_COREML)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/backends/apple/coreml)
 endif()
 
+if(EXECUTORCH_BUILD_CADENCE)
+   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/backends/cadence)
+endif()
+
 if(EXECUTORCH_BUILD_PYBIND)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third-party/pybind11)
 

backends/cadence/hifi/kernels/CMakeLists.txt

@@ -20,3 +20,5 @@ target_include_directories(
          ${NN_LIB_BASE_DIR}/xa_nnlib/algo/ndsp/hifi4/include/
          ${NXP_SDK_ROOT_DIR}/middleware/dsp/naturedsp/hifi4/include/
 )
+
+target_link_libraries(cadence_kernels PRIVATE xa_nnlib)

backends/cadence/hifi/third-party/nnlib/CMakeLists.txt

@@ -1,29 +1,20 @@
-include(ExternalProject)
+
 cmake_minimum_required(VERSION 3.10.0)
 project(cadence_nnlib)
 
-set(CMAKE_C_COMPILER xt-clang)
-set(CMAKE_CXX_COMPILER xt-clang++)
-set(CMAKE_LINKER xt-ld)
-
 
-add_custom_target( nnlib_target ALL COMMAND make install_nnlib -f makefile -C ${EXECUTORCH_ROOT}/backends/cadence/hifi/third-party/nnlib/xa_nnlib/build -j )
+add_custom_target( nnlib_target ALL COMMAND make install_nnlib -f makefile -C ${EXECUTORCH_ROOT}/backends/cadence/hifi/third-party/nnlib/nnlib-hifi4/xa_nnlib/build -j )
 
 add_library(xa_nnlib STATIC IMPORTED GLOBAL)
 add_dependencies(xa_nnlib nnlib_target)
 
 set_property(
   TARGET xa_nnlib
   PROPERTY 
-  IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/nnlib-hifi4/xa_nnlib/build/libxa_nnlib.a"
+  IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/nnlib-hifi4/xa_nnlib/build/xa_nnlib.a"
 )
 
-#set(_common_include_directories ${EXECUTORCH_ROOT}/..)
-#install(
-#  TARGETS xa_nnlib
-#  DESTINATION lib
-#  DESTINATION ${_common_include_directories}
-#)
+