Merge pull request mocleiri#120 from vikramdattu/support/enable_esp_nn_optimizations

Enabled support for ESP-NN optimizations

Author: mocleiri

micropython-modules/microlite/micropython.cmake

@@ -28,109 +28,100 @@ if (PICO_SDK_PATH)
   set(MICROLITE_PLATFORM "RP2")
 endif()
 
-if(IDF_TARGET STREQUAL "esp32")
-  set(MICROLITE_PLATFORM "ESP32")
+if(NOT MICROPY_DIR)
+    get_filename_component(MICROPY_DIR ${PROJECT_DIR}/../.. ABSOLUTE)
 endif()
 
-if(IDF_TARGET STREQUAL "esp32s2")
-  set(MICROLITE_PLATFORM "ESP32S2")
-endif()
-
-if(IDF_TARGET STREQUAL "esp32s3")
-  set(MICROLITE_PLATFORM "ESP32S3")
-endif()
+# `py.cmake` for `micropy_gather_target_properties` macro usage
+include(${MICROPY_DIR}/py/py.cmake)
 
-if(IDF_TARGET STREQUAL "esp32c3")
-  set(MICROLITE_PLATFORM "ESP32C3")
-endif()
+include (${CMAKE_CURRENT_LIST_DIR}/micropython_esp.cmake)
 
 get_filename_component(TENSORFLOW_DIR ${PROJECT_DIR}/../../../tensorflow ABSOLUTE)
 
 add_library(microlite INTERFACE)
 
-if (MICROLITE_PLATFORM STREQUAL "ESP32" OR 
-    MICROLITE_PLATFORM STREQUAL "ESP32S3" OR
-    MICROLITE_PLATFORM STREQUAL "ESP32C3" OR 
-    MICROLITE_PLATFORM STREQUAL "ESP32S2")
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
-
-endif()
-
 # needed when we have custom/specialized kernels.
 # add_custom_command(
 #     OUTPUT ${TF_MICROLITE_SPECIALIZED_SRCS}
 #     COMMAND cd ${TENSORFLOW_DIR} && ${Python3_EXECUTABLE} ${MICROPY_DIR}/py/makeversionhdr.py ${MICROPY_MPVERSION}
 #     DEPENDS MICROPY_FORCE_BUILD
 # )
 
-if (MICROLITE_PLATFORM STREQUAL "ESP32" OR 
-            MICROLITE_PLATFORM STREQUAL "ESP32S3" OR 
-            MICROLITE_PLATFORM STREQUAL "ESP32C3" OR 
-            MICROLITE_PLATFORM STREQUAL "ESP32S2")
-    set (TF_MICROLITE_LOG 
-        ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/debug_log.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/micro_time.cpp
-    )
-endif()
-
 if (MICROLITE_PLATFORM STREQUAL "RP2")
-    set (TF_MICROLITE_LOG 
+    set (TF_MICROLITE_LOG
         ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/cortex_m_generic/debug_log.cpp
         ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/cortex_m_generic/micro_time.cpp
     )
 endif()
 
+if (CONFIG_IDF_TARGET)
+    set(TF_ESP_DIR "${CMAKE_CURRENT_LIST_DIR}/../../tflm_esp_kernels/components/tflite-lib")
+    set(TF_LITE_DIR "${TF_ESP_DIR}/tensorflow/lite")
+    set(TF_MICRO_DIR "${TF_LITE_DIR}/micro")
+    set(TF_MICROLITE_LOG
+            ${TF_MICRO_DIR}/debug_log.cc
+            ${TF_MICRO_DIR}/micro_time.cc
+    )
+else()
+    set(TF_LITE_DIR "${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite")
+    set(TF_MICRO_DIR "${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro")
+endif()
 
-
-
-# copied from https://github.com/espressif/tflite-micro-esp-examples/blob/master/components/tflite-lib/CMakeLists.txt
-# commit: 2ef35273160643b172ce76078c0c95c71d528842
-set(TF_LITE_DIR "${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite")
-set(TF_MICRO_DIR "${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro")
-
-# lite c 
+# lite c
 
 file(GLOB TF_LITE_C_SRCS
           "${TF_LITE_DIR}/c/*.cpp"
           "${TF_LITE_DIR}/c/*.c")
 
-# lite core/api 
-
+# lite core/api
+if (CONFIG_IDF_TARGET)
+file(GLOB TF_LITE_API_SRCS
+          "${TF_LITE_DIR}/core/api/*.cc"
+          "${TF_LITE_DIR}/core/api/*.c"
+          "${TF_LITE_DIR}/core/c/*.cc"
+          "${TF_LITE_DIR}/core/c/*.c")
+else()
 file(GLOB TF_LITE_API_SRCS
           "${TF_LITE_DIR}/core/api/*.cpp"
           "${TF_LITE_DIR}/core/api/*.c")
+endif()
 
-# lite experimental 
+# lite experimental
 
 file(GLOB TF_LITE_MICROFRONTEND_SRCS
           "${TF_LITE_DIR}/experimental/microfrontend/lib/*.c"
+          "${TF_LITE_DIR}/experimental/microfrontend/lib/*.cc"
           "${TF_LITE_DIR}/experimental/microfrontend/lib/*.cpp")
 
-# lite kernels 
+# lite kernels
 
 file(GLOB TF_LITE_KERNELS_SRCS
           "${TF_LITE_DIR}/kernels/*.c"
           "${TF_LITE_DIR}/kernels/*.cpp"
+          "${TF_LITE_DIR}/kernels/*.cc"
           "${TF_LITE_DIR}/kernels/internal/*.c"
           "${TF_LITE_DIR}/kernels/internal/*.cpp"
+          "${TF_LITE_DIR}/kernels/internal/*.cc"
           "${TF_LITE_DIR}/kernels/internal/reference/*.c"
           "${TF_LITE_DIR}/kernels/internal/reference/*.cpp"
+          "${TF_LITE_DIR}/kernels/internal/reference/*.cc"
           )
 
-# lite schema 
+# lite schema
 file(GLOB TF_LITE_SCHEMA_SRCS
           "${TF_LITE_DIR}/schema/*.c"
+          "${TF_LITE_DIR}/schema/*.cc"
           "${TF_LITE_DIR}/schema/*.cpp")
 
-# micro 
+# micro
 
 file(GLOB TF_MICRO_SRCS
           "${TF_MICRO_DIR}/*.c"
+          "${TF_MICRO_DIR}/*.cc"
           "${TF_MICRO_DIR}/*.cpp")
 
-          
+
 # logs are platform specific and added seperately
 
 list(REMOVE_ITEM TF_MICRO_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/debug_log.cpp)
@@ -139,24 +130,28 @@ list(REMOVE_ITEM TF_MICRO_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/mi
 # arena allocator
 file(GLOB TF_MICRO_ARENA_ALLOCATOR_SRCS
           "${TF_MICRO_DIR}/arena_allocator/*.cpp"
+          "${TF_MICRO_DIR}/arena_allocator/*.cc"
           "${TF_MICRO_DIR}/arena_allocator/*.c")
 
-# micro kernels 
+# micro kernels
 
 file(GLOB TF_MICRO_KERNELS_SRCS
           "${TF_MICRO_DIR}/kernels/*.c"
+          "${TF_MICRO_DIR}/kernels/*.cc"
           "${TF_MICRO_DIR}/kernels/*.cpp")
 
-# micro memory_planner 
+# micro memory_planner
 
 file(GLOB TF_MICRO_MEMORY_PLANNER_SRCS
           "${TF_MICRO_DIR}/memory_planner/*.cpp"
+          "${TF_MICRO_DIR}/memory_planner/*.cc"
           "${TF_MICRO_DIR}/memory_planner/*.c")
 
 # tflite_bridge
 
 file(GLOB TF_MICRO_TFLITE_BRIDGE_SRCS
           "${TF_MICRO_DIR}/tflite_bridge/*.cpp"
+          "${TF_MICRO_DIR}/tflite_bridge/*.cc"
           "${TF_MICRO_DIR}/tflite_bridge/*.c")
 
 set (BOARD_ADDITIONAL_SRCS "")
@@ -171,7 +166,7 @@ if (MICROLITE_PLATFORM STREQUAL "RP2")
     list(REMOVE_ITEM TF_MICRO_KERNELS_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/kernels/pooling.cpp)
     list(REMOVE_ITEM TF_MICRO_KERNELS_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/kernels/softmax.cpp)
     list(REMOVE_ITEM TF_MICRO_KERNELS_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/kernels/svdf.cpp)
-    
+
     list(APPEND TF_MICRO_KERNELS_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/kernels/cmsis_nn/add.cpp)
     list(APPEND TF_MICRO_KERNELS_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/kernels/cmsis_nn/conv.cpp)
     list(APPEND TF_MICRO_KERNELS_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/kernels/cmsis_nn/depthwise_conv.cpp)
@@ -180,7 +175,7 @@ if (MICROLITE_PLATFORM STREQUAL "RP2")
     list(APPEND TF_MICRO_KERNELS_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/kernels/cmsis_nn/pooling.cpp)
     list(APPEND TF_MICRO_KERNELS_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/kernels/cmsis_nn/softmax.cpp)
     list(APPEND TF_MICRO_KERNELS_SRCS ${CMAKE_CURRENT_LIST_DIR}/tflm/tensorflow/lite/micro/kernels/cmsis_nn/svdf.cpp)
-    
+
     set (CMSIS_NN_SRCS
 
         ${CMAKE_CURRENT_LIST_DIR}/tflm/third_party/cmsis_nn/Source/ActivationFunctions/arm_relu6_s8.c
@@ -243,7 +238,7 @@ if (MICROLITE_PLATFORM STREQUAL "RP2")
         ${CMAKE_CURRENT_LIST_DIR}/tflm/third_party/cmsis_nn/Source/SoftmaxFunctions/arm_softmax_s8.c
         ${CMAKE_CURRENT_LIST_DIR}/tflm/third_party/cmsis_nn/Source/SoftmaxFunctions/arm_softmax_s8_s16.c
         ${CMAKE_CURRENT_LIST_DIR}/tflm/third_party/cmsis_nn/Source/SoftmaxFunctions/arm_softmax_u8.c
-        
+
         ${CMAKE_CURRENT_LIST_DIR}/tflm/third_party/cmsis_nn/Source/SVDFunctions
         ${CMAKE_CURRENT_LIST_DIR}/tflm/third_party/cmsis_nn/Source/SVDFunctions/arm_svdf_s8.c
         ${CMAKE_CURRENT_LIST_DIR}/tflm/third_party/cmsis_nn/Source/SVDFunctions/arm_svdf_state_s16_s8.c
@@ -279,13 +274,47 @@ target_sources(microlite INTERFACE
 
 else()
 
+if (CONFIG_IDF_TARGET)
+    set(tfmicro_kernels_dir ${TF_MICRO_DIR}/kernels)
+    # set(tfmicro_nn_kernels_dir
+    #     ${tfmicro_kernels_dir}/)
+
+    # remove sources which will be provided by esp_nn
+    list(REMOVE_ITEM TF_MICRO_KERNELS_SRCS
+        "${tfmicro_kernels_dir}/add.cc"
+        "${tfmicro_kernels_dir}/conv.cc"
+        "${tfmicro_kernels_dir}/depthwise_conv.cc"
+        "${tfmicro_kernels_dir}/fully_connected.cc"
+        "${tfmicro_kernels_dir}/mul.cc"
+        "${tfmicro_kernels_dir}/pooling.cc"
+        "${tfmicro_kernels_dir}/softmax.cc"
+    )
+
+    # tflm wrappers for ESP_NN
+    FILE(GLOB ESP_NN_WRAPPERS
+        "${tfmicro_kernels_dir}/esp_nn/*.cc")
+endif()
 
-target_sources(microlite INTERFACE
 #   microlite micropython module sources
+set (MICROLITE_PYTHON_SRCS
     ${CMAKE_CURRENT_LIST_DIR}/tensorflow-microlite.c
     ${CMAKE_CURRENT_LIST_DIR}/audio_frontend.c
-    ${CMAKE_CURRENT_LIST_DIR}/openmv-libtf.cpp
     ${CMAKE_CURRENT_LIST_DIR}/micropython-error-reporter.cpp
+)
+
+if (CONFIG_IDF_TARGET)
+    list(APPEND MICROLITE_PYTHON_SRCS
+        ${CMAKE_CURRENT_LIST_DIR}/openmv-libtf-updated.cpp
+    )
+else()
+    list(APPEND MICROLITE_PYTHON_SRCS
+        ${CMAKE_CURRENT_LIST_DIR}/openmv-libtf.cpp
+    )
+endif()
+
+target_sources(microlite INTERFACE
+    # micro_python sources for tflite
+    ${MICROLITE_PYTHON_SRCS}
 
     # tf lite sources
     ${TF_LITE_C_SRCS}
@@ -302,8 +331,27 @@ target_sources(microlite INTERFACE
     ${TF_MICRO_TFLITE_BRIDGE_SRCS}
 
     ${TF_MICROLITE_LOG}
+    ${ESP_NN_SRCS} # include esp-nn sources for Espressif chipsets
+    ${ESP_NN_WRAPPERS} # add tflm wrappers for ESP_NN
+    )
 
-)
+if (CONFIG_IDF_TARGET)
+    set(signal_srcs
+        ${TF_ESP_DIR}/signal/micro/kernels/rfft.cc
+        ${TF_ESP_DIR}/signal/micro/kernels/window.cc
+        ${TF_ESP_DIR}/signal/src/kiss_fft_wrappers/kiss_fft_float.cc
+        ${TF_ESP_DIR}/signal/src/kiss_fft_wrappers/kiss_fft_int16.cc
+        ${TF_ESP_DIR}/signal/src/kiss_fft_wrappers/kiss_fft_int32.cc
+        ${TF_ESP_DIR}/signal/src/rfft_float.cc
+        ${TF_ESP_DIR}/signal/src/rfft_int16.cc
+        ${TF_ESP_DIR}/signal/src/rfft_int32.cc
+        ${TF_ESP_DIR}/signal/src/window.cc
+    )
+    target_sources(microlite INTERFACE
+        ${CMAKE_CURRENT_LIST_DIR}/python_ops_resolver.cc
+        ${signal_srcs}
+    )
+endif()
 
 endif()
 
@@ -350,11 +398,22 @@ target_compile_options(microlite INTERFACE
     -Wno-error=maybe-uninitialized
 )
 
-
-
+else()
+if (CONFIG_IDF_TARGET)
+target_include_directories(microlite INTERFACE
+    ${TF_ESP_DIR}
+    ${TF_ESP_DIR}/third_party/kissfft
+    ${TF_ESP_DIR}/third_party/kissfft/tools
+    ${TF_ESP_DIR}/third_party/flatbuffers/include
+    ${TF_ESP_DIR}/third_party/gemmlowp
+    ${TF_ESP_DIR}/third_party/ruy
+    ${TF_ESP_DIR}/signal/micro/kernels
+    ${TF_ESP_DIR}/signal/src
+    ${TF_ESP_DIR}/signal/src/kiss_fft_wrappers
+    ${ESP_NN_INC}
+)
 else()
 
-# ESP32 
 target_include_directories(microlite INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}
     ${CMAKE_CURRENT_LIST_DIR}/tflm
@@ -364,13 +423,20 @@ target_include_directories(microlite INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}/tflm/third_party/gemmlowp
     ${CMAKE_CURRENT_LIST_DIR}/tflm/third_party/ruy
 )
+endif()
 
 target_compile_definitions(microlite INTERFACE
     MODULE_MICROLITE_ENABLED=1
     TF_LITE_STATIC_MEMORY=1
     TF_LITE_MCU_DEBUG_LOG
     NDEBUG
-)
+    )
+if (CONFIG_IDF_TARGET)
+    target_compile_definitions(microlite INTERFACE
+        ESP_NN=1 # enables esp_nn optimizations if those sources are added
+        CONFIG_NN_OPTIMIZED=1 # use Optimized vs ansi code from ESP-NN
+    )
+endif()
 
 target_compile_options(microlite INTERFACE
     -Wno-error
@@ -388,7 +454,5 @@ target_compile_options(microlite INTERFACE
 
 endif()
 
-
-
 target_link_libraries(usermod INTERFACE microlite)
-
+micropy_gather_target_properties(microlite)