cellular-infrastructure
/
osmo-trx
mirror of https://gerrit.osmocom.org/osmo-trx
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sigproc: Make convolution and convert input buffers immutable 

For good practice, use const specifier when applicable.

Signed-off-by: Tom Tsou <tom@tsou.cc>
This commit is contained in:
Tom Tsou 2015-03-25 12:55:11 -07:00 committed by Tom Tsou
parent d4d3daa12e
commit f147b17447
5 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Transceiver52M/common/convert.h
View File

@ -1,7 +1,7 @@
#ifndef _CONVERT_H_ #ifndef _CONVERT_H_
#define _CONVERT_H_ #define _CONVERT_H_
void convert_float_short(short *out, float *in, float scale, int len); void convert_float_short(short *out, const float *in, float scale, int len);
void convert_short_float(float *out, short *in, int len); void convert_short_float(float *out, const short *in, int len);
#endif /* _CONVERT_H_ */ #endif /* _CONVERT_H_ */

16
Transceiver52M/common/convolve.h
View File

@ -3,26 +3,26 @@
void *convolve_h_alloc(int num); void *convolve_h_alloc(int num);
int convolve_real(float *x, int x_len, int convolve_real(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset); int step, int offset);
int convolve_complex(float *x, int x_len, int convolve_complex(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset); int step, int offset);
int base_convolve_real(float *x, int x_len, int base_convolve_real(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset); int step, int offset);
int base_convolve_complex(float *x, int x_len, int base_convolve_complex(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset); int step, int offset);

24
Transceiver52M/common/convolve_base.c
View File

@ -26,21 +26,21 @@
#endif #endif
/* Base multiply and accumulate complex-real */ /* Base multiply and accumulate complex-real */
static void mac_real(float *x, float *h, float *y) static void mac_real(const float *x, const float *h, float *y)
{ {
y[0] += x[0] * h[0]; y[0] += x[0] * h[0];
y[1] += x[1] * h[0]; y[1] += x[1] * h[0];
} }
/* Base multiply and accumulate complex-complex */ /* Base multiply and accumulate complex-complex */
static void mac_cmplx(float *x, float *h, float *y) static void mac_cmplx(const float *x, const float *h, float *y)
{ {
y[0] += x[0] * h[0] - x[1] * h[1]; y[0] += x[0] * h[0] - x[1] * h[1];
y[1] += x[0] * h[1] + x[1] * h[0]; y[1] += x[0] * h[1] + x[1] * h[0];
} }
/* Base vector complex-complex multiply and accumulate */ /* Base vector complex-complex multiply and accumulate */
static void mac_real_vec_n(float *x, float *h, float *y, static void mac_real_vec_n(const float *x, const float *h, float *y,
int len, int step, int offset) int len, int step, int offset)
{ {
for (int i = offset; i < len; i += step) for (int i = offset; i < len; i += step)
@ -48,7 +48,7 @@ static void mac_real_vec_n(float *x, float *h, float *y,
} }
/* Base vector complex-complex multiply and accumulate */ /* Base vector complex-complex multiply and accumulate */
static void mac_cmplx_vec_n(float *x, float *h, float *y, static void mac_cmplx_vec_n(const float *x, const float *h, float *y,
int len, int step, int offset) int len, int step, int offset)
{ {
for (int i = offset; i < len; i += step) for (int i = offset; i < len; i += step)
@ -56,8 +56,8 @@ static void mac_cmplx_vec_n(float *x, float *h, float *y,
} }
/* Base complex-real convolution */ /* Base complex-real convolution */
int _base_convolve_real(float *x, int x_len, int _base_convolve_real(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset) int step, int offset)
@ -73,8 +73,8 @@ int _base_convolve_real(float *x, int x_len,
} }
/* Base complex-complex convolution */ /* Base complex-complex convolution */
int _base_convolve_complex(float *x, int x_len, int _base_convolve_complex(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset) int step, int offset)
@ -110,8 +110,8 @@ int bounds_check(int x_len, int h_len, int y_len,
} }
/* API: Non-aligned (no SSE) complex-real */ /* API: Non-aligned (no SSE) complex-real */
int base_convolve_real(float *x, int x_len, int base_convolve_real(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset) int step, int offset)
@ -128,8 +128,8 @@ int base_convolve_real(float *x, int x_len,
} }
/* API: Non-aligned (no SSE) complex-complex */ /* API: Non-aligned (no SSE) complex-complex */
int base_convolve_complex(float *x, int x_len, int base_convolve_complex(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset) int step, int offset)

19
Transceiver52M/x86/convert.c
View File

@ -34,7 +34,7 @@
/* 16*N 16-bit signed integer converted to single precision floats */ /* 16*N 16-bit signed integer converted to single precision floats */
static void _sse_convert_si16_ps_16n(float *restrict out, static void _sse_convert_si16_ps_16n(float *restrict out,
short *restrict in, const short *restrict in,
int len) int len)
{ {
__m128i m0, m1, m2, m3, m4, m5; __m128i m0, m1, m2, m3, m4, m5;
@ -69,7 +69,7 @@ static void _sse_convert_si16_ps_16n(float *restrict out,
/* 16*N 16-bit signed integer conversion with remainder */ /* 16*N 16-bit signed integer conversion with remainder */
static void _sse_convert_si16_ps(float *restrict out, static void _sse_convert_si16_ps(float *restrict out,
short *restrict in, const short *restrict in,
int len) int len)
{ {
int start = len / 16 * 16; int start = len / 16 * 16;
@ -83,7 +83,7 @@ static void _sse_convert_si16_ps(float *restrict out,
/* 8*N single precision floats scaled and converted to 16-bit signed integer */ /* 8*N single precision floats scaled and converted to 16-bit signed integer */
static void _sse_convert_scale_ps_si16_8n(short *restrict out, static void _sse_convert_scale_ps_si16_8n(short *restrict out,
float *restrict in, const float *restrict in,
float scale, int len) float scale, int len)
{ {
__m128 m0, m1, m2; __m128 m0, m1, m2;
@ -111,7 +111,7 @@ static void _sse_convert_scale_ps_si16_8n(short *restrict out,
/* 8*N single precision floats scaled and converted with remainder */ /* 8*N single precision floats scaled and converted with remainder */
static void _sse_convert_scale_ps_si16(short *restrict out, static void _sse_convert_scale_ps_si16(short *restrict out,
float *restrict in, const float *restrict in,
float scale, int len) float scale, int len)
{ {
int start = len / 8 * 8; int start = len / 8 * 8;
@ -124,7 +124,7 @@ static void _sse_convert_scale_ps_si16(short *restrict out,
/* 16*N single precision floats scaled and converted to 16-bit signed integer */ /* 16*N single precision floats scaled and converted to 16-bit signed integer */
static void _sse_convert_scale_ps_si16_16n(short *restrict out, static void _sse_convert_scale_ps_si16_16n(short *restrict out,
float *restrict in, const float *restrict in,
float scale, int len) float scale, int len)
{ {
__m128 m0, m1, m2, m3, m4; __m128 m0, m1, m2, m3, m4;
@ -158,7 +158,8 @@ static void _sse_convert_scale_ps_si16_16n(short *restrict out,
} }
} }
#else /* HAVE_SSE3 */ #else /* HAVE_SSE3 */
static void convert_scale_ps_si16(short *out, float *in, float scale, int len) static void convert_scale_ps_si16(short *out, const float *in,
float scale, int len)
{ {
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
out[i] = in[i] * scale; out[i] = in[i] * scale;
@ -166,14 +167,14 @@ static void convert_scale_ps_si16(short *out, float *in, float scale, int len)
#endif #endif
#ifndef HAVE_SSE4_1 #ifndef HAVE_SSE4_1
static void convert_si16_ps(float *out, short *in, int len) static void convert_si16_ps(float *out, const short *in, int len)
{ {
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
out[i] = in[i]; out[i] = in[i];
} }
#endif #endif
void convert_float_short(short *out, float *in, float scale, int len) void convert_float_short(short *out, const float *in, float scale, int len)
{ {
#ifdef HAVE_SSE3 #ifdef HAVE_SSE3
if (!(len % 16)) if (!(len % 16))
@ -187,7 +188,7 @@ void convert_float_short(short *out, float *in, float scale, int len)
#endif #endif
} }
void convert_short_float(float *out, short *in, int len) void convert_short_float(float *out, const short *in, int len)
{ {
#ifdef HAVE_SSE4_1 #ifdef HAVE_SSE4_1
if (!(len % 16)) if (!(len % 16))

60
Transceiver52M/x86/convolve.c
View File

@ -27,14 +27,14 @@
#endif #endif
/* Forward declarations from base implementation */ /* Forward declarations from base implementation */
int _base_convolve_real(float *x, int x_len, int _base_convolve_real(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset); int step, int offset);
int _base_convolve_complex(float *x, int x_len, int _base_convolve_complex(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset); int step, int offset);
@ -47,8 +47,8 @@ int bounds_check(int x_len, int h_len, int y_len,
#include <pmmintrin.h> #include <pmmintrin.h>
/* 4-tap SSE complex-real convolution */ /* 4-tap SSE complex-real convolution */
static void sse_conv_real4(float *restrict x, static void sse_conv_real4(const float *restrict x,
float *restrict h, const float *restrict h,
float *restrict y, float *restrict y,
int len) int len)
{ {
@ -81,8 +81,8 @@ static void sse_conv_real4(float *restrict x,
} }
/* 8-tap SSE complex-real convolution */ /* 8-tap SSE complex-real convolution */
static void sse_conv_real8(float *restrict x, static void sse_conv_real8(const float *restrict x,
float *restrict h, const float *restrict h,
float *restrict y, float *restrict y,
int len) int len)
{ {
@ -128,8 +128,8 @@ static void sse_conv_real8(float *restrict x,
} }
/* 12-tap SSE complex-real convolution */ /* 12-tap SSE complex-real convolution */
static void sse_conv_real12(float *restrict x, static void sse_conv_real12(const float *restrict x,
float *restrict h, const float *restrict h,
float *restrict y, float *restrict y,
int len) int len)
{ {
@ -190,8 +190,8 @@ static void sse_conv_real12(float *restrict x,
} }
/* 16-tap SSE complex-real convolution */ /* 16-tap SSE complex-real convolution */
static void sse_conv_real16(float *restrict x, static void sse_conv_real16(const float *restrict x,
float *restrict h, const float *restrict h,
float *restrict y, float *restrict y,
int len) int len)
{ {
@ -265,8 +265,8 @@ static void sse_conv_real16(float *restrict x,
} }
/* 20-tap SSE complex-real convolution */ /* 20-tap SSE complex-real convolution */
static void sse_conv_real20(float *restrict x, static void sse_conv_real20(const float *restrict x,
float *restrict h, const float *restrict h,
float *restrict y, float *restrict y,
int len) int len)
{ {
@ -351,7 +351,10 @@ static void sse_conv_real20(float *restrict x,
} }
/* 4*N-tap SSE complex-real convolution */ /* 4*N-tap SSE complex-real convolution */
static void sse_conv_real4n(float *x, float *h, float *y, int h_len, int len) static void sse_conv_real4n(const float *x,
const float *h,
float *y,
int h_len, int len)
{ {
__m128 m0, m1, m2, m4, m5, m6, m7; __m128 m0, m1, m2, m4, m5, m6, m7;
@ -391,7 +394,10 @@ static void sse_conv_real4n(float *x, float *h, float *y, int h_len, int len)
} }
/* 4*N-tap SSE complex-complex convolution */ /* 4*N-tap SSE complex-complex convolution */
static void sse_conv_cmplx_4n(float *x, float *h, float *y, int h_len, int len) static void sse_conv_cmplx_4n(const float *x,
const float *h,
float *y,
int h_len, int len)
{ {
__m128 m0, m1, m2, m3, m4, m5, m6, m7; __m128 m0, m1, m2, m3, m4, m5, m6, m7;
@ -439,7 +445,10 @@ static void sse_conv_cmplx_4n(float *x, float *h, float *y, int h_len, int len)
} }
/* 8*N-tap SSE complex-complex convolution */ /* 8*N-tap SSE complex-complex convolution */
static void sse_conv_cmplx_8n(float *x, float *h, float *y, int h_len, int len) static void sse_conv_cmplx_8n(const float *x,
const float *h,
float *y,
int h_len, int len)
{ {
__m128 m0, m1, m2, m3, m4, m5, m6, m7; __m128 m0, m1, m2, m3, m4, m5, m6, m7;
__m128 m8, m9, m10, m11, m12, m13, m14, m15; __m128 m8, m9, m10, m11, m12, m13, m14, m15;
@ -511,14 +520,16 @@ static void sse_conv_cmplx_8n(float *x, float *h, float *y, int h_len, int len)
#endif #endif
/* API: Aligned complex-real */ /* API: Aligned complex-real */
int convolve_real(float *x, int x_len, int convolve_real(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset) int step, int offset)
{ {
void (*conv_func)(float *, float *, float *, int) = NULL; void (*conv_func)(const float *, const float *,
void (*conv_func_n)(float *, float *, float *, int, int) = NULL; float *, int) = NULL;
void (*conv_func_n)(const float *, const float *,
float *, int, int) = NULL;
if (bounds_check(x_len, h_len, y_len, start, len, step) < 0) if (bounds_check(x_len, h_len, y_len, start, len, step) < 0)
return -1; return -1;
@ -566,13 +577,14 @@ int convolve_real(float *x, int x_len,
} }
/* API: Aligned complex-complex */ /* API: Aligned complex-complex */
int convolve_complex(float *x, int x_len, int convolve_complex(const float *x, int x_len,
float *h, int h_len, const float *h, int h_len,
float *y, int y_len, float *y, int y_len,
int start, int len, int start, int len,
int step, int offset) int step, int offset)
{ {
void (*conv_func)(float *, float *, float *, int, int) = NULL; void (*conv_func)(const float *, const float *,
float *, int, int) = NULL;
if (bounds_check(x_len, h_len, y_len, start, len, step) < 0) if (bounds_check(x_len, h_len, y_len, start, len, step) < 0)
return -1; return -1;