From d5cafc2cc06047695c6cd15a47ec74e0f6090246 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 8 Jun 2022 12:45:39 +0200 Subject: [PATCH] xray ignores tiny functions, do not want. Change-Id: Ie55458f31d16e76e84855ed2c634a9dd9a5e139b --- Transceiver52M/arch/common/convert_base.c | 2 ++ Transceiver52M/arch/common/convolve_base.c | 10 ++++++++++ Transceiver52M/arch/x86/convert.c | 2 ++ Transceiver52M/arch/x86/convert_sse_3.c | 3 +++ Transceiver52M/arch/x86/convert_sse_4_1.c | 2 ++ Transceiver52M/arch/x86/convolve.c | 2 ++ Transceiver52M/arch/x86/convolve_sse_3.c | 8 ++++++++ Transceiver52M/sigProcLib.cpp | 1 + 8 files changed, 30 insertions(+) diff --git a/Transceiver52M/arch/common/convert_base.c b/Transceiver52M/arch/common/convert_base.c index 9a01a1e8..55bff13b 100644 --- a/Transceiver52M/arch/common/convert_base.c +++ b/Transceiver52M/arch/common/convert_base.c @@ -17,6 +17,7 @@ #include "convert.h" +__attribute__((xray_never_instrument)) void base_convert_float_short(short *out, const float *in, float scale, int len) { @@ -24,6 +25,7 @@ void base_convert_float_short(short *out, const float *in, out[i] = in[i] * scale; } +__attribute__((xray_never_instrument)) void base_convert_short_float(float *out, const short *in, int len) { for (int i = 0; i < len; i++) diff --git a/Transceiver52M/arch/common/convolve_base.c b/Transceiver52M/arch/common/convolve_base.c index 3765c5c9..ec08d554 100644 --- a/Transceiver52M/arch/common/convolve_base.c +++ b/Transceiver52M/arch/common/convolve_base.c @@ -24,6 +24,7 @@ #endif /* Base multiply and accumulate complex-real */ +__attribute__((xray_never_instrument)) static void mac_real(const float *x, const float *h, float *y) { y[0] += x[0] * h[0]; @@ -31,6 +32,7 @@ static void mac_real(const float *x, const float *h, float *y) } /* Base multiply and accumulate complex-complex */ +__attribute__((xray_never_instrument)) static void mac_cmplx(const float *x, const float *h, float *y) { y[0] += x[0] * h[0] - x[1] * h[1]; @@ -38,6 +40,7 @@ static void mac_cmplx(const float *x, const float *h, float *y) } /* Base vector complex-complex multiply and accumulate */ +__attribute__((xray_never_instrument)) static void mac_real_vec_n(const float *x, const float *h, float *y, int len) { @@ -46,6 +49,7 @@ static void mac_real_vec_n(const float *x, const float *h, float *y, } /* Base vector complex-complex multiply and accumulate */ +__attribute__((xray_never_instrument)) static void mac_cmplx_vec_n(const float *x, const float *h, float *y, int len) { @@ -54,6 +58,7 @@ static void mac_cmplx_vec_n(const float *x, const float *h, float *y, } /* Base complex-real convolution */ +__attribute__((xray_never_instrument)) int _base_convolve_real(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -69,6 +74,7 @@ int _base_convolve_real(const float *x, int x_len, } /* Base complex-complex convolution */ +__attribute__((xray_never_instrument)) int _base_convolve_complex(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -85,6 +91,7 @@ int _base_convolve_complex(const float *x, int x_len, } /* Buffer validity checks */ +__attribute__((xray_never_instrument)) int bounds_check(int x_len, int h_len, int y_len, int start, int len) { @@ -105,6 +112,7 @@ int bounds_check(int x_len, int h_len, int y_len, } /* API: Non-aligned (no SSE) complex-real */ +__attribute__((xray_never_instrument)) int base_convolve_real(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -122,6 +130,7 @@ int base_convolve_real(const float *x, int x_len, } /* API: Non-aligned (no SSE) complex-complex */ +__attribute__((xray_never_instrument)) int base_convolve_complex(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -139,6 +148,7 @@ int base_convolve_complex(const float *x, int x_len, } /* Aligned filter tap allocation */ +__attribute__((xray_never_instrument)) void *convolve_h_alloc(size_t len) { #ifdef HAVE_SSE3 diff --git a/Transceiver52M/arch/x86/convert.c b/Transceiver52M/arch/x86/convert.c index 596233c0..dd4e15cb 100644 --- a/Transceiver52M/arch/x86/convert.c +++ b/Transceiver52M/arch/x86/convert.c @@ -60,6 +60,7 @@ void convert_init(void) #endif } +__attribute__((xray_never_instrument)) void convert_float_short(short *out, const float *in, float scale, int len) { if (!(len % 16)) @@ -70,6 +71,7 @@ void convert_float_short(short *out, const float *in, float scale, int len) c.convert_scale_ps_si16(out, in, scale, len); } +__attribute__((xray_never_instrument)) void convert_short_float(float *out, const short *in, int len) { if (!(len % 16)) diff --git a/Transceiver52M/arch/x86/convert_sse_3.c b/Transceiver52M/arch/x86/convert_sse_3.c index f00ecf5b..1814a8cd 100644 --- a/Transceiver52M/arch/x86/convert_sse_3.c +++ b/Transceiver52M/arch/x86/convert_sse_3.c @@ -26,6 +26,7 @@ #include /* 8*N single precision floats scaled and converted to 16-bit signed integer */ +__attribute__((xray_never_instrument)) void _sse_convert_scale_ps_si16_8n(short *restrict out, const float *restrict in, float scale, int len) @@ -54,6 +55,7 @@ void _sse_convert_scale_ps_si16_8n(short *restrict out, } /* 8*N single precision floats scaled and converted with remainder */ +__attribute__((xray_never_instrument)) void _sse_convert_scale_ps_si16(short *restrict out, const float *restrict in, float scale, int len) { @@ -66,6 +68,7 @@ void _sse_convert_scale_ps_si16(short *restrict out, } /* 16*N single precision floats scaled and converted to 16-bit signed integer */ +__attribute__((xray_never_instrument)) void _sse_convert_scale_ps_si16_16n(short *restrict out, const float *restrict in, float scale, int len) diff --git a/Transceiver52M/arch/x86/convert_sse_4_1.c b/Transceiver52M/arch/x86/convert_sse_4_1.c index 736a3769..881a795d 100644 --- a/Transceiver52M/arch/x86/convert_sse_4_1.c +++ b/Transceiver52M/arch/x86/convert_sse_4_1.c @@ -25,6 +25,7 @@ #include /* 16*N 16-bit signed integer converted to single precision floats */ +__attribute__((xray_never_instrument)) void _sse_convert_si16_ps_16n(float *restrict out, const short *restrict in, int len) { @@ -59,6 +60,7 @@ void _sse_convert_si16_ps_16n(float *restrict out, } /* 16*N 16-bit signed integer conversion with remainder */ +__attribute__((xray_never_instrument)) void _sse_convert_si16_ps(float *restrict out, const short *restrict in, int len) { diff --git a/Transceiver52M/arch/x86/convolve.c b/Transceiver52M/arch/x86/convolve.c index 45a3719c..a1b1dcd9 100644 --- a/Transceiver52M/arch/x86/convolve.c +++ b/Transceiver52M/arch/x86/convolve.c @@ -91,6 +91,7 @@ void convolve_init(void) } /* API: Aligned complex-real */ +__attribute__((xray_never_instrument)) int convolve_real(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, int start, int len) @@ -130,6 +131,7 @@ int convolve_real(const float *x, int x_len, } /* API: Aligned complex-complex */ +__attribute__((xray_never_instrument)) int convolve_complex(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, diff --git a/Transceiver52M/arch/x86/convolve_sse_3.c b/Transceiver52M/arch/x86/convolve_sse_3.c index ca4dc713..5495974e 100644 --- a/Transceiver52M/arch/x86/convolve_sse_3.c +++ b/Transceiver52M/arch/x86/convolve_sse_3.c @@ -27,6 +27,7 @@ #include /* 4-tap SSE complex-real convolution */ +__attribute__((xray_never_instrument)) void sse_conv_real4(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -68,6 +69,7 @@ void sse_conv_real4(const float *x, int x_len, } /* 8-tap SSE complex-real convolution */ +__attribute__((xray_never_instrument)) void sse_conv_real8(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -119,6 +121,7 @@ void sse_conv_real8(const float *x, int x_len, } /* 12-tap SSE complex-real convolution */ +__attribute__((xray_never_instrument)) void sse_conv_real12(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -185,6 +188,7 @@ void sse_conv_real12(const float *x, int x_len, } /* 16-tap SSE complex-real convolution */ +__attribute__((xray_never_instrument)) void sse_conv_real16(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -264,6 +268,7 @@ void sse_conv_real16(const float *x, int x_len, } /* 20-tap SSE complex-real convolution */ +__attribute__((xray_never_instrument)) void sse_conv_real20(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -354,6 +359,7 @@ void sse_conv_real20(const float *x, int x_len, } /* 4*N-tap SSE complex-real convolution */ +__attribute__((xray_never_instrument)) void sse_conv_real4n(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -401,6 +407,7 @@ void sse_conv_real4n(const float *x, int x_len, } /* 4*N-tap SSE complex-complex convolution */ +__attribute__((xray_never_instrument)) void sse_conv_cmplx_4n(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, @@ -459,6 +466,7 @@ void sse_conv_cmplx_4n(const float *x, int x_len, } /* 8*N-tap SSE complex-complex convolution */ +__attribute__((xray_never_instrument)) void sse_conv_cmplx_8n(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index df87f94b..2976ccde 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -1088,6 +1088,7 @@ signalVector *delayVector(const signalVector *in, signalVector *out, float delay return out; } +__attribute__((xray_never_instrument)) static complex interpolatePoint(const signalVector &inSig, float ix) { int start = (int) (floor(ix) - 10);