diff --git a/Include/dsp/interpolation_functions.h b/Include/dsp/interpolation_functions.h index f578e2ed..dbea4eb3 100755 --- a/Include/dsp/interpolation_functions.h +++ b/Include/dsp/interpolation_functions.h @@ -55,7 +55,7 @@ extern "C" uint32_t nValues; /**< nValues */ float32_t x1; /**< x1 */ float32_t xSpacing; /**< xSpacing */ - float32_t *pYData; /**< pointer to the table of Y values */ + const float32_t *pYData; /**< pointer to the table of Y values */ } arm_linear_interp_instance_f32; /** @@ -65,7 +65,7 @@ extern "C" { uint16_t numRows; /**< number of rows in the data table. */ uint16_t numCols; /**< number of columns in the data table. */ - float32_t *pData; /**< points to the data table. */ + const float32_t *pData; /**< points to the data table. */ } arm_bilinear_interp_instance_f32; /** @@ -75,7 +75,7 @@ extern "C" { uint16_t numRows; /**< number of rows in the data table. */ uint16_t numCols; /**< number of columns in the data table. */ - q31_t *pData; /**< points to the data table. */ + const q31_t *pData; /**< points to the data table. */ } arm_bilinear_interp_instance_q31; /** @@ -85,7 +85,7 @@ extern "C" { uint16_t numRows; /**< number of rows in the data table. */ uint16_t numCols; /**< number of columns in the data table. */ - q15_t *pData; /**< points to the data table. */ + const q15_t *pData; /**< points to the data table. */ } arm_bilinear_interp_instance_q15; /** @@ -95,7 +95,7 @@ extern "C" { uint16_t numRows; /**< number of rows in the data table. */ uint16_t numCols; /**< number of columns in the data table. */ - q7_t *pData; /**< points to the data table. */ + const q7_t *pData; /**< points to the data table. */ } arm_bilinear_interp_instance_q7; diff --git a/Include/dsp/interpolation_functions_f16.h b/Include/dsp/interpolation_functions_f16.h index 8b6e6a99..7b880488 100755 --- a/Include/dsp/interpolation_functions_f16.h +++ b/Include/dsp/interpolation_functions_f16.h @@ -45,7 +45,7 @@ typedef struct uint32_t nValues; /**< nValues */ float16_t x1; /**< x1 */ float16_t xSpacing; /**< xSpacing */ - float16_t *pYData; /**< pointer to the table of Y values */ + const float16_t *pYData; /**< pointer to the table of Y values */ } arm_linear_interp_instance_f16; /** @@ -55,7 +55,7 @@ typedef struct { uint16_t numRows;/**< number of rows in the data table. */ uint16_t numCols;/**< number of columns in the data table. */ - float16_t *pData; /**< points to the data table. */ + const float16_t *pData; /**< points to the data table. */ } arm_bilinear_interp_instance_f16; /** diff --git a/Source/InterpolationFunctions/arm_bilinear_interp_f16.c b/Source/InterpolationFunctions/arm_bilinear_interp_f16.c index 3ece81ca..fb1517f5 100755 --- a/Source/InterpolationFunctions/arm_bilinear_interp_f16.c +++ b/Source/InterpolationFunctions/arm_bilinear_interp_f16.c @@ -57,7 +57,7 @@ { float16_t out; float16_t f00, f01, f10, f11; - float16_t *pData = S->pData; + const float16_t *pData = S->pData; int32_t xIndex, yIndex, index; float16_t xdiff, ydiff; float16_t b1, b2, b3, b4; diff --git a/Source/InterpolationFunctions/arm_bilinear_interp_f32.c b/Source/InterpolationFunctions/arm_bilinear_interp_f32.c index fc001d72..79d1db9b 100755 --- a/Source/InterpolationFunctions/arm_bilinear_interp_f32.c +++ b/Source/InterpolationFunctions/arm_bilinear_interp_f32.c @@ -51,7 +51,7 @@ * { * uint16_t numRows; * uint16_t numCols; - * float32_t *pData; + * const float32_t *pData; * } arm_bilinear_interp_instance_f32; * * @@ -105,7 +105,7 @@ { float32_t out; float32_t f00, f01, f10, f11; - float32_t *pData = S->pData; + const float32_t *pData = S->pData; int32_t xIndex, yIndex, index; float32_t xdiff, ydiff; float32_t b1, b2, b3, b4; diff --git a/Source/InterpolationFunctions/arm_bilinear_interp_q15.c b/Source/InterpolationFunctions/arm_bilinear_interp_q15.c index 67267366..cb5f6cfd 100755 --- a/Source/InterpolationFunctions/arm_bilinear_interp_q15.c +++ b/Source/InterpolationFunctions/arm_bilinear_interp_q15.c @@ -54,7 +54,7 @@ q15_t x1, x2, y1, y2; /* Nearest output values */ q31_t xfract, yfract; /* X, Y fractional parts */ int32_t rI, cI; /* Row and column indices */ - q15_t *pYData = S->pData; /* pointer to output table values */ + const q15_t *pYData = S->pData; /* pointer to output table values */ uint32_t nCols = S->numCols; /* num of rows */ /* Input is in 12.20 format */ diff --git a/Source/InterpolationFunctions/arm_bilinear_interp_q31.c b/Source/InterpolationFunctions/arm_bilinear_interp_q31.c index cc8560ec..1aaf9a46 100755 --- a/Source/InterpolationFunctions/arm_bilinear_interp_q31.c +++ b/Source/InterpolationFunctions/arm_bilinear_interp_q31.c @@ -55,7 +55,7 @@ q31_t xfract, yfract; /* X, Y fractional parts */ q31_t x1, x2, y1, y2; /* Nearest output values */ int32_t rI, cI; /* Row and column indices */ - q31_t *pYData = S->pData; /* pointer to output table values */ + const q31_t *pYData = S->pData; /* pointer to output table values */ uint32_t nCols = S->numCols; /* num of rows */ /* Input is in 12.20 format */ diff --git a/Source/InterpolationFunctions/arm_bilinear_interp_q7.c b/Source/InterpolationFunctions/arm_bilinear_interp_q7.c index 204342e3..90befa8a 100755 --- a/Source/InterpolationFunctions/arm_bilinear_interp_q7.c +++ b/Source/InterpolationFunctions/arm_bilinear_interp_q7.c @@ -55,7 +55,7 @@ q31_t xfract, yfract; /* X, Y fractional parts */ q7_t x1, x2, y1, y2; /* Nearest output values */ int32_t rI, cI; /* Row and column indices */ - q7_t *pYData = S->pData; /* pointer to output table values */ + const q7_t *pYData = S->pData; /* pointer to output table values */ uint32_t nCols = S->numCols; /* num of rows */ /* Input is in 12.20 format */ diff --git a/Source/InterpolationFunctions/arm_linear_interp_f16.c b/Source/InterpolationFunctions/arm_linear_interp_f16.c index ab0c68de..862e6757 100755 --- a/Source/InterpolationFunctions/arm_linear_interp_f16.c +++ b/Source/InterpolationFunctions/arm_linear_interp_f16.c @@ -57,7 +57,7 @@ float16_t y0, y1; /* Nearest output values */ float16_t xSpacing = S->xSpacing; /* spacing between input values */ int32_t i; /* Index variable */ - float16_t *pYData = S->pYData; /* pointer to output table */ + const float16_t *pYData = S->pYData; /* pointer to output table */ /* Calculation of index */ i = (int32_t) (((_Float16)x - (_Float16)S->x1) / (_Float16)xSpacing); diff --git a/Source/InterpolationFunctions/arm_linear_interp_f32.c b/Source/InterpolationFunctions/arm_linear_interp_f32.c index a73db171..8da2c631 100755 --- a/Source/InterpolationFunctions/arm_linear_interp_f32.c +++ b/Source/InterpolationFunctions/arm_linear_interp_f32.c @@ -85,7 +85,7 @@ float32_t y0, y1; /* Nearest output values */ float32_t xSpacing = S->xSpacing; /* spacing between input values */ int32_t i; /* Index variable */ - float32_t *pYData = S->pYData; /* pointer to output table */ + const float32_t *pYData = S->pYData; /* pointer to output table */ /* Calculation of index */ i = (int32_t) ((x - S->x1) / xSpacing); diff --git a/Testing/cmsis_build/runall.py b/Testing/cmsis_build/runall.py index c28bfd45..6bf209a8 100644 --- a/Testing/cmsis_build/runall.py +++ b/Testing/cmsis_build/runall.py @@ -167,7 +167,12 @@ for t in tests: #("StatsTestsF32","../Output.pickle") #] -allSuites=[("DistanceTestsF32","../Output.pickle")] +allSuites=[("InterpolationTestsF32","../Output.pickle"), +("InterpolationTestsQ31","../Output.pickle"), +("InterpolationTestsQ15","../Output.pickle"), +("InterpolationTestsQ7","../Output.pickle"), +("InterpolationTestsF16","../Output_f16.pickle"), +] #allSuites=[("StatsTestsQ7","../Output.pickle")] @@ -201,18 +206,19 @@ solutions={ ] } -solutions={ - 'testac6.csolution.yml':[ - # ("VHT-Corstone-310","CS310"), - ("VHT-Corstone-300","CS300") - ], - 'testgcc.csolution.yml':[ - #("VHT-Corstone-310","CS310"), - #("VHT_M55","M55"), - ##("VHT_M33","M33_DSP_FP"), - ("VHT_M7","M7DP"), - ] -} +# Override previous solutions for more restricted testing. +#solutions={ +# 'testac6.csolution.yml':[ +# # ("VHT-Corstone-310","CS310"), +# ("VHT-Corstone-300","CS300") +# ], +# 'testgcc.csolution.yml':[ +# #("VHT-Corstone-310","CS310"), +# #("VHT_M55","M55"), +# ##("VHT_M33","M33_DSP_FP"), +# ("VHT_M7","M7DP"), +# ] +#} HTMLHEADER="""
diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj index 597349f9..dd75b3e3 100644 --- a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj +++ b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj index 006fd9ea..7fdaa4ed 100644 --- a/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj +++ b/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M0P.cprj b/Testing/cmsis_build/test.Release+VHT_M0P.cprj index 7492c079..b5dacf54 100644 --- a/Testing/cmsis_build/test.Release+VHT_M0P.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M0P.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M23.cprj b/Testing/cmsis_build/test.Release+VHT_M23.cprj index df78cd6d..b83f2829 100644 --- a/Testing/cmsis_build/test.Release+VHT_M23.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M23.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M3.cprj b/Testing/cmsis_build/test.Release+VHT_M3.cprj index ef0eacdd..5288ba64 100644 --- a/Testing/cmsis_build/test.Release+VHT_M3.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M3.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M33.cprj b/Testing/cmsis_build/test.Release+VHT_M33.cprj index cb9b4bbd..42073e08 100644 --- a/Testing/cmsis_build/test.Release+VHT_M33.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M33.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M4.cprj b/Testing/cmsis_build/test.Release+VHT_M4.cprj index 99daf4b0..452d8d2a 100644 --- a/Testing/cmsis_build/test.Release+VHT_M4.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M4.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M55.cprj b/Testing/cmsis_build/test.Release+VHT_M55.cprj index 48627c5b..fdfa7ef4 100644 --- a/Testing/cmsis_build/test.Release+VHT_M55.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M55.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M7.cprj b/Testing/cmsis_build/test.Release+VHT_M7.cprj index 396a6ff8..db93e5d0 100644 --- a/Testing/cmsis_build/test.Release+VHT_M7.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M7.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj b/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj index 611295c5..f67bf504 100644 --- a/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj @@ -1,6 +1,6 @@ - + Automatically generated project