build: add NMSIS_LIB_COMPAT variable to specify toolchain builtin dsp/nn library

Signed-off-by: Huaqi Fang <578567190@qq.com>

Author: fanghuaqi

NMSIS/DSP/Examples/RISCV/Makefile.common

@@ -13,11 +13,7 @@ RISCV_ALIGN ?= OFF
 COMMON_FLAGS ?= -O2
 STDCLIB ?= newlib_full
 
-ifeq (${TOOLCHAIN}, terapines)
-NMSIS_LIB := tpt_dsp
-else
 NMSIS_LIB := nmsis_dsp
-endif
 
 ifeq ($(BENCH_UNIT),instret)
 $(warning "Benchmark by reading cpu instret")

NMSIS/NN/Benchmark/Makefile.common

@@ -9,11 +9,7 @@ RISCV_ALIGN ?= OFF
 COMMON_FLAGS ?= -O2
 STDCLIB ?= newlib_full
 
-ifeq (${TOOLCHAIN}, terapines)
-NMSIS_LIB := tpt_nn
-else
 NMSIS_LIB := nmsis_nn
-endif
 
 SUBDIR:=$(wildcard *)
 SRCDIRS += . $(SUBDIR)

NMSIS/NN/Tests/Cases/Makefile.common

@@ -15,11 +15,7 @@ RISCV_ALIGN ?= OFF
 COMMON_FLAGS ?= -O2
 STDCLIB ?= newlib_full
 
-ifeq (${TOOLCHAIN}, terapines)
-NMSIS_LIB := tpt_nn
-else
 NMSIS_LIB := nmsis_nn
-endif
 
 ifeq ($(BENCH_UNIT),instret)
 $(warning "Benchmark by reading cpu instret")

NMSIS/Scripts/Build/Makefile.nmsis

@@ -52,7 +52,7 @@ EXTRA_NLOPTS +=
 endif
 
 ifneq ($(EXTRAOPTS),)
-EXTRA_NLOPTS += --extraopts ${EXTRAOPTS}
+EXTRA_NLOPTS += --extraopts $(EXTRAOPTS)
 endif
 
 ifneq ($(TOOLCHAIN),)

NMSIS/build.mk

@@ -3,19 +3,36 @@ NMSIS_LIB_ARCH ?= $(RISCV_ARCH)
 
 INCDIRS += $(NUCLEI_SDK_NMSIS)/Core/Include
 
+# When set to 1, will use compatiable library
+# provided in toolchain such as terapines zcc toolchain
+# present NMSIS DSP/NN compatiable library
+NMSIS_LIB_COMPAT ?=
+
 ifeq ($(filter nmsis_nn,$(NMSIS_LIB_SORTED)),nmsis_nn)
 INCDIRS += $(NUCLEI_SDK_NMSIS)/NN/Include
 LIBDIRS += $(NUCLEI_SDK_NMSIS)/Library/NN/GCC
-LDLIBS += -lnmsis_nn_$(NMSIS_LIB_ARCH)
-else ifeq ($(filter tpt_nn,$(NMSIS_LIB_SORTED)),tpt_nn)
+ifeq ($(TOOLCHAIN),terapines)
+ifeq ($(NMSIS_LIB_COMPAT),1)
 LDLIBS += -lnn
+else
+LDLIBS += -lnmsis_nn_$(NMSIS_LIB_ARCH)
+endif
+else
+LDLIBS += -lnmsis_nn_$(NMSIS_LIB_ARCH)
+endif
 endif
 
 ifeq ($(filter nmsis_dsp,$(NMSIS_LIB_SORTED)),nmsis_dsp)
 INCDIRS += $(NUCLEI_SDK_NMSIS)/DSP/Include \
 	$(NUCLEI_SDK_NMSIS)/DSP/PrivateInclude
 LIBDIRS += $(NUCLEI_SDK_NMSIS)/Library/DSP/GCC
-LDLIBS += -lnmsis_dsp_$(NMSIS_LIB_ARCH)
-else ifeq ($(filter tpt_dsp,$(NMSIS_LIB_SORTED)),tpt_dsp)
+ifeq ($(TOOLCHAIN),terapines)
+ifeq ($(NMSIS_LIB_COMPAT),1)
 LDLIBS += -ldsp
+else
+LDLIBS += -lnmsis_dsp_$(NMSIS_LIB_ARCH)
+endif
+else
+LDLIBS += -lnmsis_dsp_$(NMSIS_LIB_ARCH)
+endif
 endif