experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #47190 from foss-for-synopsys-dwc-arc-processors:arc_build_fix

Browse Source 
PiperOrigin-RevId: 357985606
Change-Id: I2b84e69834225fc4744f2c931195514f11007527
This commit is contained in:
TensorFlower Gardener 2021-02-17 11:00:09 -08:00
commit 30d46c800e
9 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tensorflow/lite/micro/examples/hello_world/README.md
View File

@ -45,7 +45,7 @@ The example project for ARC EM SDP platform can be generated with the following
command: command:
``` ```
make -f tensorflow/lite/micro/tools/make/Makefile TARGET=arc_emsdp TAGS=no_arc_mli generate_hello_world_make_project make -f tensorflow/lite/micro/tools/make/Makefile TARGET=arc_emsdp OPTIMIZED_KERNEL_DIR=arc_mli ARC_TAGS=no_arc_mli generate_hello_world_make_project
``` ```
### Build and Run Example ### Build and Run Example
@ -245,7 +245,7 @@ make -f tensorflow/lite/micro/tools/make/Makefile TARGET=himax_we1_evb third_par
Generate hello world project Generate hello world project
``` ```
make -f tensorflow/lite/micro/tools/make/Makefile generate_hello_world_make_project TARGET=himax_we1_evb TAGS=no_arc_mli make -f tensorflow/lite/micro/tools/make/Makefile generate_hello_world_make_project TARGET=himax_we1_evb ARC_TAGS=no_arc_mli
``` ```
### Build and Burn Example ### Build and Burn Example

5
tensorflow/lite/micro/examples/micro_speech/README.md
View File

@ -66,11 +66,12 @@ SDP platform can be generated with the following command:
``` ```
make -f tensorflow/lite/micro/tools/make/Makefile \ make -f tensorflow/lite/micro/tools/make/Makefile \
TARGET=arc_emsdp TAGS=reduce_codesize \ TARGET=arc_emsdp ARC_TAGS=reduce_codesize \
OPTIMIZED_KERNEL_DIR=arc_mli \
generate_micro_speech_mock_make_project generate_micro_speech_mock_make_project
``` ```
Note that `TAGS=reduce_codesize` applies example specific changes of code to Note that `ARC_TAGS=reduce_codesize` applies example specific changes of code to
reduce total size of application. It can be omitted. reduce total size of application. It can be omitted.
### Build and Run Example ### Build and Run Example

4
tensorflow/lite/micro/examples/micro_speech/arc_emsdp/Makefile.inc
View File

@ -4,7 +4,7 @@ ifeq ($(TARGET), arc_emsdp)
# In particular: # In particular:
# - Extend Heap and stack size for application needs # - Extend Heap and stack size for application needs
# - Use Linker command file with better usage of fast memory # - Use Linker command file with better usage of fast memory
# - Optional (TAGS=reduce_codesize): In case project was # - Optional (ARC_TAGS=reduce_codesize): In case project was
# generated with MLI usage, reduce scratch buffers. # generated with MLI usage, reduce scratch buffers.
MICRO_SPEECH_HDRS += \ MICRO_SPEECH_HDRS += \
@ -36,7 +36,7 @@ ifeq ($(TARGET), arc_emsdp)
@echo Makefile: No Reference fallback for MLI supported functions >> $@ @echo Makefile: No Reference fallback for MLI supported functions >> $@
ifneq ($(filter $(ALL_TAGS), reduce_codesize),) ifneq ($(filter $(ARC_TAGS), reduce_codesize),)
# In case 'reduce_codesize' tag is present, we replace common MLI functions with # In case 'reduce_codesize' tag is present, we replace common MLI functions with
# specializations appropriate for this particular graph. But such changes of code # specializations appropriate for this particular graph. But such changes of code
# with high probability may not be acceptable for other graphs and will need # with high probability may not be acceptable for other graphs and will need

5
tensorflow/lite/micro/examples/person_detection/README.md
View File

@ -52,11 +52,12 @@ command:
``` ```
make -f tensorflow/lite/micro/tools/make/Makefile \ make -f tensorflow/lite/micro/tools/make/Makefile \
TARGET=arc_emsdp TAGS=reduce_codesize \ TARGET=arc_emsdp ARC_TAGS=reduce_codesize \
OPTIMIZED_KERNEL_DIR=arc_mli \
generate_person_detection_int8_make_project generate_person_detection_int8_make_project
``` ```
Note that `TAGS=reduce_codesize` applies example specific changes of code to Note that `ARC_TAGS=reduce_codesize` applies example specific changes of code to
reduce total size of application. It can be omitted. reduce total size of application. It can be omitted.
### Build and Run Example ### Build and Run Example

2
tensorflow/lite/micro/examples/person_detection/arc_emsdp/Makefile.inc
View File

@ -25,7 +25,7 @@ ifeq ($(TARGET), arc_emsdp)
@sed -E -i 's#MLI_ONLY *\?= *false#MLI_ONLY \?= true#' $(word 2, $^) @sed -E -i 's#MLI_ONLY *\?= *false#MLI_ONLY \?= true#' $(word 2, $^)
@echo Makefile: No Reference fallback for MLI supported functions >> $@ @echo Makefile: No Reference fallback for MLI supported functions >> $@
ifneq ($(filter $(ALL_TAGS), reduce_codesize),) ifneq ($(filter $(ARC_TAGS), reduce_codesize),)
#In case 'reduce_codesize' tag is present, we replace common MLI functions with #In case 'reduce_codesize' tag is present, we replace common MLI functions with
#specializations appropriate for this particular graph.But such changes of code #specializations appropriate for this particular graph.But such changes of code
#with high probability may not be acceptable for other graphs and will need #with high probability may not be acceptable for other graphs and will need

8
tensorflow/lite/micro/kernels/arc_mli/README.md
View File

@ -21,16 +21,16 @@ ARC specific target implies usage of embARC MLI.
For example: For example:
``` ```
make -f tensorflow/lite/micro/tools/make/Makefile TARGET=arc_emsdp generate_person_detection_int8_make_project make -f tensorflow/lite/micro/tools/make/Makefile TARGET=arc_emsdp OPTIMIZED_KERNEL_DIR=arc_mli generate_person_detection_int8_make_project
``` ```
In case MLI implementation can’t be used, kernels in this folder fallback to In case MLI implementation can’t be used, kernels in this folder fallback to
TFLM reference implementations. For applications which may not benefit from MLI TFLM reference implementations. For applications which may not benefit from MLI
library, projects can be generated without these implementations by adding library, projects can be generated without these implementations by adding
`TAGS=no_arc_mli` in the command line, which can reduce overall code size: `ARC_TAGS=no_arc_mli` in the command line, which can reduce overall code size:
``` ```
make -f tensorflow/lite/micro/tools/make/Makefile TARGET=arc_emsdp TAGS=no_arc_mli generate_person_detection_int8_make_project make -f tensorflow/lite/micro/tools/make/Makefile TARGET=arc_emsdp OPTIMIZED_KERNEL_DIR=arc_mli ARC_TAGS=no_arc_mli generate_person_detection_int8_make_project
``` ```
For ARC EM SDP board, a pre-compiled MLI library is downloaded and used in the For ARC EM SDP board, a pre-compiled MLI library is downloaded and used in the
@ -39,7 +39,7 @@ and compiled during project generation phase. To build library from sources for
ARC EM SDP platform, add `BUILD_ARC_MLI=true` option to make command: ARC EM SDP platform, add `BUILD_ARC_MLI=true` option to make command:
``` ```
make -f tensorflow/lite/micro/tools/make/Makefile TARGET=arc_emsdp BUILD_ARC_MLI=true generate_person_detection_int8_make_project make -f tensorflow/lite/micro/tools/make/Makefile TARGET=arc_emsdp OPTIMIZED_KERNEL_DIR=arc_mli BUILD_ARC_MLI=true generate_person_detection_int8_make_project
``` ```
If an application exclusively uses accelerated MLI kernel implementations, one If an application exclusively uses accelerated MLI kernel implementations, one

4
tensorflow/lite/micro/tools/make/ext_libs/arc_mli.inc
View File

@ -18,8 +18,8 @@ ifeq ($(TARGET_ARCH), arc)
# MLI Library is used by default for ARC platform whenever it is possible. # MLI Library is used by default for ARC platform whenever it is possible.
# To use TFLM reference implementation MLI should be intentionally turned off # To use TFLM reference implementation MLI should be intentionally turned off
# by passing 'no_arc_mli' tag (make -f <tflm_main_makefile> TAGS=no_arc_mli ...) # by passing 'no_arc_mli' tag (make -f <tflm_main_makefile> ARC_TAGS=no_arc_mli ...)
ifeq ($(filter no_arc_mli,$(ALL_TAGS)),) ifeq ($(filter no_arc_mli,$(ARC_TAGS)),)
ALL_TAGS += arc_mli ALL_TAGS += arc_mli

12
tensorflow/lite/micro/tools/make/targets/arc/README.md
View File

@ -149,7 +149,7 @@ use a shell to execute the following command from the root directory of the
TensorFlow repo: TensorFlow repo:
``` ```
make -f tensorflow/lite/micro/tools/make/Makefile generate_person_detection_test_int8_make_project TARGET=arc_emsdp make -f tensorflow/lite/micro/tools/make/Makefile generate_person_detection_test_int8_make_project TARGET=arc_emsdp OPTIMIZED_KERNEL_DIR=arc_mli
``` ```
The application project will be generated into The application project will be generated into
@ -166,8 +166,8 @@ is used by default to speed up execution of some kernels for asymmetrically
quantized layers. Kernels which use MLI-based implementations are kept in the quantized layers. Kernels which use MLI-based implementations are kept in the
*tensorflow/lite/micro/kernels/arc_mli* folder. For applications which may not *tensorflow/lite/micro/kernels/arc_mli* folder. For applications which may not
benefit from MLI library, the project can be generated without these benefit from MLI library, the project can be generated without these
implementations by adding `TAGS=no_arc_mli` in the command line. This can reduce implementations by adding `ARC_TAGS=no_arc_mli` in the command line. This can
code size when the optimized kernels are not required. reduce code size when the optimized kernels are not required.
For more options on embARC MLI usage see For more options on embARC MLI usage see
[kernels/arc_mli/README.md](/tensorflow/lite/micro/kernels/arc_mli/README.md). [kernels/arc_mli/README.md](/tensorflow/lite/micro/kernels/arc_mli/README.md).
@ -279,7 +279,7 @@ For instance, to build **Person Detection** test application, use the following
command from the root directory of the TensorFlow repo: command from the root directory of the TensorFlow repo:
``` ```
make -f tensorflow/lite/micro/tools/make/Makefile generate_person_detection_test_int8_make_project TARGET=arc_custom TCF_FILE=<path_to_tcf_file> LCF_FILE=<path_to_lcf_file> make -f tensorflow/lite/micro/tools/make/Makefile generate_person_detection_test_int8_make_project TARGET=arc_custom OPTIMIZED_KERNEL_DIR=arc_mli TCF_FILE=<path_to_tcf_file> LCF_FILE=<path_to_lcf_file>
``` ```
The application project will be generated into The application project will be generated into
@ -291,8 +291,8 @@ is used by default to speed up execution of some kernels for asymmetrically
quantized layers. Kernels which use MLI-based implementations are kept in the quantized layers. Kernels which use MLI-based implementations are kept in the
*tensorflow/lite/micro/kernels/arc_mli* folder. For applications which may not *tensorflow/lite/micro/kernels/arc_mli* folder. For applications which may not
benefit from MLI library, the project can be generated without these benefit from MLI library, the project can be generated without these
implementations by adding `TAGS=no_arc_mli` in the command line. This can reduce implementations by adding `ARC_TAGS=no_arc_mli` in the command line. This can
code size when the optimized kernels are not required. reduce code size when the optimized kernels are not required.
For more options on embARC MLI usage see For more options on embARC MLI usage see
[kernels/arc_mli/README.md](/tensorflow/lite/micro/kernels/arc_mli/README.md). [kernels/arc_mli/README.md](/tensorflow/lite/micro/kernels/arc_mli/README.md).

2
tensorflow/lite/micro/tools/make/targets/arc_emsdp_makefile.inc
View File

@ -21,7 +21,7 @@ ARC_TOOLCHAIN := mwdt
BUILD_ARC_MLI := false BUILD_ARC_MLI := false
ARC_MLI_PRE_COMPILED_TARGET := emsdp_em11d_em9d_dfss ARC_MLI_PRE_COMPILED_TARGET := emsdp_em11d_em9d_dfss
ifneq ($(filter no_arc_mli,$(ALL_TAGS)),) ifneq ($(filter no_arc_mli,$(ARC_TAGS)),)
MLI_LIB_DIR = arc_mli_package MLI_LIB_DIR = arc_mli_package
$(eval $(call add_third_party_download,$(EMBARC_MLI_PRE_COMPILED_URL),$(EMBARC_MLI_PRE_COMPILED_MD5),$(MLI_LIB_DIR),)) $(eval $(call add_third_party_download,$(EMBARC_MLI_PRE_COMPILED_URL),$(EMBARC_MLI_PRE_COMPILED_MD5),$(MLI_LIB_DIR),))
else ifeq ($(BUILD_ARC_MLI), true) else ifeq ($(BUILD_ARC_MLI), true)