build: Fix wrong setup for nmsis library selection in DSP testing makefile

Signed-off-by: Huaqi Fang <[email protected]>

Author: fanghuaqi

NMSIS/DSP/Benchmark/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/DSP/Test/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/build.mk

@@ -9,30 +9,24 @@ INCDIRS += $(NUCLEI_SDK_NMSIS)/Core/Include
 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
-ifeq ($(TOOLCHAIN),terapines)
-ifeq ($(NMSIS_LIB_COMPAT),1)
+ifeq ($(TOOLCHAIN)-$(NMSIS_LIB_COMPAT),terapines-1)
+# use nn library from terapines zcc toolchain when NMSIS_LIB_COMPAT=1
 LDLIBS += -lnn
 else
 LDLIBS += -lnmsis_nn_$(NMSIS_LIB_ARCH)
-endif
-else
-LDLIBS += -lnmsis_nn_$(NMSIS_LIB_ARCH)
+INCDIRS += $(NUCLEI_SDK_NMSIS)/NN/Include
+LIBDIRS += $(NUCLEI_SDK_NMSIS)/Library/NN/GCC
 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
-ifeq ($(TOOLCHAIN),terapines)
-ifeq ($(NMSIS_LIB_COMPAT),1)
+ifeq ($(TOOLCHAIN)-$(NMSIS_LIB_COMPAT),terapines-1)
+# use dsp library from terapines zcc toolchain when NMSIS_LIB_COMPAT=1
 LDLIBS += -ldsp
 else
 LDLIBS += -lnmsis_dsp_$(NMSIS_LIB_ARCH)
-endif
-else
-LDLIBS += -lnmsis_dsp_$(NMSIS_LIB_ARCH)
+INCDIRS += $(NUCLEI_SDK_NMSIS)/DSP/Include \
+	$(NUCLEI_SDK_NMSIS)/DSP/PrivateInclude
+LIBDIRS += $(NUCLEI_SDK_NMSIS)/Library/DSP/GCC
 endif
 endif