Merge pull request #44562 from advaitjain:xtensa_hifimini-issue43898

PiperOrigin-RevId: 340772299 Change-Id: I340fd99dc0bcfb380782696e2c7825c0dac88aeb
2020-11-04 19:58:22 -08:00 · 2020-11-04 19:58:22 -08:00 · b00edde0d6
commit b00edde0d6
parent 4932038648 2a8152031a
1 changed files with 45 additions and 47 deletions
--- a/tensorflow/lite/micro/tools/make/targets/xtensa_hifimini_makefile.inc
+++ b/tensorflow/lite/micro/tools/make/targets/xtensa_hifimini_makefile.inc
@ -8,52 +8,50 @@
 #   - XTENSA_CORE: The name of the Xtensa core to use
 #      For example: hifimini

-ifeq ($(TARGET), xtensa_hifimini)
-  TARGET_ARCH := xtensa_hifimini
-
-  ifndef XTENSA_BASE
-    $(error XTENSA_BASE is undefined)
-  endif
-
-  ifndef XTENSA_TOOLS_VERSION
-    $(error XTENSA_TOOLS_VERSION is undefined)
-  endif
-
-  ifndef XTENSA_CORE
-    $(error XTENSA_CORE is undefined)
-  endif
-
-  PLATFORM_FLAGS = \
-    -DTF_LITE_MCU_DEBUG_LOG \
-    --xtensa-core=$(XTENSA_CORE) \
-    -mcoproc \
-    -DXTENSA \
-    -DMAX_RFFT_PWR=9 \
-    -DMIN_RFFT_PWR=MAX_RFFT_PWR
-
-
-  export PATH := $(XTENSA_BASE)/tools/$(XTENSA_TOOLS_VERSION)/XtensaTools/bin:$(PATH)
-  TARGET_TOOLCHAIN_PREFIX := xt-
-  CXX_TOOL := clang++
-  CC_TOOL := clang
-
-  CXXFLAGS += $(PLATFORM_FLAGS)
-  CCFLAGS += $(PLATFORM_FLAGS)
-
-  # TODO(b/150240249): Do not remove -fno-rtti once that works for the Xtensa toolchain.
-  CXXFLAGS := $(filter-out -fno-rtti, $(CXXFLAGS))
-
-  TEST_SCRIPT := tensorflow/lite/micro/testing/test_xtensa_hifimini_binary.sh
-
-  # TODO(b/156962140): This manually maintained list of excluded examples is
-  # quite error prone.
-  EXCLUDED_EXAMPLE_TESTS := \
-    tensorflow/lite/micro/examples/image_recognition_experimental/Makefile.inc \
-    tensorflow/lite/micro/examples/magic_wand/Makefile.inc \
-    tensorflow/lite/micro/examples/micro_speech/Makefile.inc \
-    tensorflow/lite/micro/examples/network_tester/Makefile.inc \
-    tensorflow/lite/micro/examples/person_detection/Makefile.inc \
-    tensorflow/lite/micro/examples/person_detection_experimental/Makefile.inc
-  MICRO_LITE_EXAMPLE_TESTS := $(filter-out $(EXCLUDED_EXAMPLE_TESTS), $(MICRO_LITE_EXAMPLE_TESTS))
+TARGET_ARCH := xtensa_hifimini

+ifndef XTENSA_BASE
+  $(error XTENSA_BASE is undefined)
 endif
+
+ifndef XTENSA_TOOLS_VERSION
+  $(error XTENSA_TOOLS_VERSION is undefined)
+endif
+
+ifndef XTENSA_CORE
+  $(error XTENSA_CORE is undefined)
+endif
+
+PLATFORM_FLAGS = \
+  -DTF_LITE_MCU_DEBUG_LOG \
+  --xtensa-core=$(XTENSA_CORE) \
+  -mcoproc \
+  -DXTENSA \
+  -DMAX_RFFT_PWR=9 \
+  -DMIN_RFFT_PWR=MAX_RFFT_PWR
+
+
+export PATH := $(XTENSA_BASE)/tools/$(XTENSA_TOOLS_VERSION)/XtensaTools/bin:$(PATH)
+TARGET_TOOLCHAIN_PREFIX := xt-
+CXX_TOOL := clang++
+CC_TOOL := clang
+
+CXXFLAGS += $(PLATFORM_FLAGS)
+CCFLAGS += $(PLATFORM_FLAGS)
+
+# TODO(b/150240249): Do not remove -fno-rtti once that works for the Xtensa toolchain.
+CXXFLAGS := $(filter-out -fno-rtti, $(CXXFLAGS))
+
+TEST_SCRIPT := tensorflow/lite/micro/testing/test_xtensa_hifimini_binary.sh
+
+# TODO(b/156962140): This manually maintained list of excluded examples is
+# quite error prone.
+EXCLUDED_EXAMPLE_TESTS := \
+  tensorflow/lite/micro/examples/image_recognition_experimental/Makefile.inc \
+  tensorflow/lite/micro/examples/magic_wand/Makefile.inc \
+  tensorflow/lite/micro/examples/micro_speech/Makefile.inc \
+  tensorflow/lite/micro/examples/network_tester/Makefile.inc \
+  tensorflow/lite/micro/examples/person_detection/Makefile.inc \
+  tensorflow/lite/micro/examples/person_detection_experimental/Makefile.inc
+MICRO_LITE_EXAMPLE_TESTS := $(filter-out $(EXCLUDED_EXAMPLE_TESTS), $(MICRO_LITE_EXAMPLE_TESTS))
+