Corrected issue #72 (258f31c5) · Commits · Wenxi XU / Cmsis Dsp

Include/dsp/fast_math_functions.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@

		#include "dsp/basic_math_functions.h"

		#include <math.h>

		#ifdef __cplusplus
		extern "C"
		@@ -251,6 +252,16 @@ __STATIC_FORCEINLINE arm_status arm_sqrt_f32(
		*pOut = sqrtf(in);
		#endif

		#elif defined ( __ARMCC_VERSION ) && ( __ARMCC_VERSION >= 6010050 )
		*pOut = _sqrtf(in);
		#elif defined(__GNUC_PYTHON__)
		*pOut = sqrtf(in);
		#elif defined ( __GNUC__ )
		#if defined (__VFP_FP__) && !defined(__SOFTFP__)
		__ASM("VSQRT.F32 %0,%1" : "=t"(*pOut) : "t"(in));
		#else
		*pOut = sqrtf(in);
		#endif
		#else
		*pOut = sqrtf(in);
		#endif

Testing/cmsis_build/RTE/Device/SSE-310-MPS3/region_limits.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@
		#define TOTAL_S_DDR4_SIZE (0x10000000) /* 256 MB */

		/* Heap and Stack sizes for secure and nonsecure applications */
		#define HEAP_SIZE (0x00100000) /* 1 KiB */
		#define HEAP_SIZE (0x00020000) /* 1 KiB */
		#define STACK_SIZE (0x00002000) /* 1 KiB */

		#endif /* __REGION_LIMITS_H__ */

Testing/cmsis_build/boot.clayer.yml

+6 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,9 @@ layer:


		components:
		- component: DMA350
		for-type:
		- +VHT-Corstone-310
		- component: Device:Startup&C Startup
		not-for-type:
		- +VHT-Corstone-300
		@@ -35,6 +38,9 @@ layer:
		for-type:
		- +VHT-Corstone-300
		- +VHT-Corstone-310
		- component: ARM::Native Driver:DMA350 Remap
		for-type:
		- +VHT-Corstone-310
		- component: ARM::Native Driver:Timeout
		for-type:
		- +VHT-Corstone-300

Testing/cmsis_build/runall.py

+34 −11

Original line number	Diff line number	Diff line
		@@ -7,9 +7,14 @@ import colorama
		from colorama import init,Fore, Back, Style

		parser = argparse.ArgumentParser(description='Parse test description')
		parser.add_argument('-avh', nargs='?',type = str, default="C:/Keil_v5/ARM/VHT_11.18.29", help="AVH folder")
		parser.add_argument('-avh', nargs='?',type = str, default="C:/Keil_v5/ARM/VHT", help="AVH folder")
		parser.add_argument('-d', action='store_true', help="Debug log")

		args = parser.parse_args()

		DEBUG=False
		if args.d:
		DEBUG=True

		init()

		@@ -66,7 +71,10 @@ class Result:
		# disable the dump of stderr
		def run(*args,mustPrint=False,dumpStdErr=True):
		global ERROR_OCCURED
		global DEBUG
		try:
		if DEBUG:
		print(" ".join(args))
		result=subprocess.run(args,text=True,capture_output=True,timeout=600)
		if result.returncode !=0 :
		ERROR_OCCURED = True
		@@ -79,6 +87,7 @@ def run(*args,mustPrint=False,dumpStdErr=True):
		print(result.stdout)
		return(Result(result.stdout))
		except Exception as e:
		printError("Exception occured")
		ERROR_OCCURED = True
		return(Result(str(e),error=True))

		@@ -148,6 +157,13 @@ for t in tests:
		# Test suite and output pickle needed to decode the result
		#print(allSuites)

		allSuites=[("ComplexTestsF32","../Output.pickle"),
		("DistanceTestsF32","../Output.pickle"),
		("UnaryTestsF32","../Output.pickle"),
		("QuaternionTestsF32","../Output.pickle"),
		("StatsTestsF32","../Output.pickle")
		]

		#allSuites=[("BasicTestsF32","../Output.pickle"),
		#("BasicTestsQ31","../Output.pickle")]

		@@ -160,24 +176,25 @@ for t in tests:
		# and the configuration file
		solutions={
		'testac6.csolution.yml':[
		("VHT-Corstone-310","CS310"),
		# ("VHT-Corstone-310","CS310"),
		("VHT-Corstone-300","CS300"),
		#("VHT_M33","M33_DSP_FP"),
		# #("VHT_M33","M33_DSP_FP"),
		("VHT_M7","M7DP"),
		("VHT_M7_UNROLLED","M7DP"),
		#("VHT_M4","M4FP"),
		#("VHT_M3","M3"),
		#("VHT_M23","M23"),
		# #("VHT_M4","M4FP"),
		# #("VHT_M3","M3"),
		# #("VHT_M23","M23"),
		("VHT_M0P","M0plus")
		],
		'testgcc.csolution.yml':[
		#("VHT-Corstone-310","CS310"),
		("VHT_M55","M55"),
		#("VHT_M33","M33_DSP_FP"),
		##("VHT_M33","M33_DSP_FP"),
		("VHT_M7","M7DP"),
		("VHT_M7_UNROLLED","M7DP"),
		#("VHT_M4","M4FP"),
		#("VHT_M3","M3"),
		#("VHT_M23","M23"),
		##("VHT_M4","M4FP"),
		##("VHT_M3","M3"),
		##("VHT_M23","M23"),
		("VHT_M0P","M0plus")
		]
		}
		@@ -199,7 +216,13 @@ with open("summary.html","w") as f:
		print(HTMLHEADER,file=f)
		for s in solutions:
		printTitle("Process solution %s" % s)
		run("csolution","convert","-s",s)
		res=run("csolution","convert","-s",s)
		if res.error:
		printError("Error csolution")
		print("<p><font color=\"red\">Error converting csolution %s</font></p><PRE>" % s,file=f)
		print(res.msg,file=f)
		print("</PRE>",file=f)
		continue
		print("<h1>Solution %s</h1>" % s,file=f)
		maxNbBuilds=len(solutions[s])
		buildNb=0

Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj

+1 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
		<cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
		<created timestamp="2022-11-09T08:17:12" tool="csolution 1.1.0"/>
		<created timestamp="2022-11-29T14:54:04" tool="csolution 1.1.0"/>

		<info isLayer="false">
		<description>Automatically generated project</description>

Admin message