mirror of https://github.com/drowe67/LPCNet.git
add SSE support (for test purpose, hard to real use)
parent
3c04282bef
commit
ca9e9e02ab
|
|
@ -10,6 +10,7 @@ project(LPCNet C)
|
|||
option(DISABLE_CPU_OPTIMIZATION "Disable CPU optimization discovery." OFF)
|
||||
option(AVX2 "Enable AVX2 CPU optimizations." OFF)
|
||||
option(AVX "Enable AVX CPU optimizations." OFF)
|
||||
option(SSE "Enable SSE CPU optimizations." OFF)
|
||||
option(NEON "Enable NEON CPU optimizations for RPi." OFF)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
|
@ -63,6 +64,8 @@ if(NOT DISABLE_CPU_OPTIMIZATION)
|
|||
OUTPUT_VARIABLE AVX2)
|
||||
execute_process(COMMAND grep -c "avx " /proc/cpuinfo
|
||||
OUTPUT_VARIABLE AVX)
|
||||
execute_process(COMMAND grep -c "sse " /proc/cpuinfo
|
||||
OUTPUT_VARIABLE SSE)
|
||||
execute_process(COMMAND grep -c "neon" /proc/cpuinfo
|
||||
OUTPUT_VARIABLE NEON)
|
||||
elseif(APPLE)
|
||||
|
|
@ -88,6 +91,10 @@ elseif(${AVX} OR ${AVX} GREATER 0)
|
|||
# AVX2 machines will also match on AVX
|
||||
message(STATUS "avx processor flags found or enabled.")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx")
|
||||
elseif(${SSE} OR ${SSE} GREATER 0)
|
||||
# AVX and AVX2 machines will also match on AVX
|
||||
message(STATUS "sse processor flags found or enabled.")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse")
|
||||
endif()
|
||||
|
||||
# RPi / ARM 32bit
|
||||
|
|
|
|||
|
|
@ -49,11 +49,11 @@ target_link_libraries(dump_data lpcnetfreedv m codec2)
|
|||
add_executable(test_lpcnet test_lpcnet.c)
|
||||
target_link_libraries(test_lpcnet lpcnetfreedv m codec2)
|
||||
|
||||
if(AVX OR AVX2 OR CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
|
||||
if(SSE OR AVX OR AVX2 OR CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
|
||||
add_executable(test_vec test_vec.c)
|
||||
target_link_libraries(test_vec m)
|
||||
else()
|
||||
message(WARNING "No AVX/AVX2 CPU flags identified, not building test_vec.")
|
||||
message(WARNING "No SSE/AVX/AVX2 CPU flags identified, not building test_vec.")
|
||||
endif()
|
||||
|
||||
add_executable(quant_feat quant_feat.c)
|
||||
|
|
|
|||
|
|
@ -43,6 +43,8 @@
|
|||
|
||||
#ifdef __AVX__
|
||||
#include "vec_avx.h"
|
||||
#elif __SSE__
|
||||
#include "vec_sse.h"
|
||||
#elif __ARM_NEON__ || __aarch64__
|
||||
#include "vec_neon.h"
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -26,6 +26,9 @@ const char simd[]="AVX2";
|
|||
#else
|
||||
const char simd[]="AVX";
|
||||
#endif
|
||||
#elif __SSE__
|
||||
#include "vec_sse.h"
|
||||
const char simd[]="SSE";
|
||||
#elif __ARM_NEON__ || __aarch64__
|
||||
#include "vec_neon.h"
|
||||
const char simd[]="NEON";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,211 @@
|
|||
/* Copyright (c) 2020 SASANO Takayoshi
|
||||
2018 David Rowe
|
||||
2018 Mozilla
|
||||
2008-2011 Octasic Inc.
|
||||
2012-2017 Jean-Marc Valin */
|
||||
/*
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
|
||||
- Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
|
||||
- Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
|
||||
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
/*
|
||||
SSE implementation of vector operations, compile with -msse
|
||||
port from Arm NEON support
|
||||
*/
|
||||
|
||||
#include <xmmintrin.h>
|
||||
|
||||
#ifndef LPCNET_TEST
|
||||
static float celt_exp2(float x)
|
||||
{
|
||||
int integer;
|
||||
float frac;
|
||||
union {
|
||||
float f;
|
||||
opus_uint32 i;
|
||||
} res;
|
||||
integer = floor(x);
|
||||
if (integer < -50)
|
||||
return 0;
|
||||
frac = x-integer;
|
||||
/* K0 = 1, K1 = log(2), K2 = 3-4*log(2), K3 = 3*log(2) - 2 */
|
||||
res.f = 0.99992522f + frac * (0.69583354f
|
||||
+ frac * (0.22606716f + 0.078024523f*frac));
|
||||
res.i = (res.i + (integer<<23)) & 0x7fffffff;
|
||||
return res.f;
|
||||
}
|
||||
#define celt_exp_sse(x) celt_exp2((x)*1.44269504f)
|
||||
|
||||
static float tansig_approx(float x)
|
||||
{
|
||||
int i;
|
||||
float y, dy;
|
||||
float sign=1;
|
||||
/* Tests are reversed to catch NaNs */
|
||||
if (!(x<8))
|
||||
return 1;
|
||||
if (!(x>-8))
|
||||
return -1;
|
||||
#ifndef FIXED_POINT
|
||||
/* Another check in case of -ffast-math */
|
||||
if (celt_isnan(x))
|
||||
return 0;
|
||||
#endif
|
||||
if (x<0)
|
||||
{
|
||||
x=-x;
|
||||
sign=-1;
|
||||
}
|
||||
i = (int)floor(.5f+25*x);
|
||||
x -= .04f*i;
|
||||
y = tansig_table[i];
|
||||
dy = 1-y*y;
|
||||
y = y + x*dy*(1 - y*x);
|
||||
return sign*y;
|
||||
}
|
||||
|
||||
static OPUS_INLINE float sigmoid_approx(float x)
|
||||
{
|
||||
return .5f + .5f*tansig_approx(.5f*x);
|
||||
}
|
||||
|
||||
static void softmax(float *y, const float *x, int N)
|
||||
{
|
||||
int i;
|
||||
for (i=0;i<N;i++)
|
||||
y[i] = celt_exp_sse(x[i]);
|
||||
}
|
||||
|
||||
static void vec_tanh(float *y, const float *x, int N)
|
||||
{
|
||||
int i;
|
||||
for (i=0;i<N;i++)
|
||||
{
|
||||
y[i] = tansig_approx(x[i]);
|
||||
}
|
||||
}
|
||||
|
||||
static void vec_sigmoid(float *y, const float *x, int N)
|
||||
{
|
||||
int i;
|
||||
for (i=0;i<N;i++)
|
||||
{
|
||||
y[i] = sigmoid_approx(x[i]);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void sgemv_accum16(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
|
||||
{
|
||||
int i, j;
|
||||
for (i=0;i<rows;i+=16)
|
||||
{
|
||||
float * restrict y = &out[i];
|
||||
|
||||
/* keep y[0..15] in registers for duration of inner loop */
|
||||
|
||||
__m128 y0_3 = _mm_loadu_ps(&y[0]);
|
||||
__m128 y4_7 = _mm_loadu_ps(&y[4]);
|
||||
__m128 y8_11 = _mm_loadu_ps(&y[8]);
|
||||
__m128 y12_15 = _mm_loadu_ps(&y[12]);
|
||||
|
||||
for (j=0;j<cols;j++)
|
||||
{
|
||||
const float * restrict w;
|
||||
__m128 wvec0_3, wvec4_7, wvec8_11, wvec12_15;
|
||||
__m128 xj = _mm_set1_ps(x[j]);
|
||||
|
||||
w = &weights[j*col_stride + i];
|
||||
|
||||
wvec0_3 = _mm_loadu_ps(&w[0]);
|
||||
wvec4_7 = _mm_loadu_ps(&w[4]);
|
||||
wvec8_11 = _mm_loadu_ps(&w[8]);
|
||||
wvec12_15 = _mm_loadu_ps(&w[12]);
|
||||
|
||||
wvec0_3 = _mm_mul_ps(wvec0_3, xj);
|
||||
wvec4_7 = _mm_mul_ps(wvec4_7, xj);
|
||||
wvec8_11 = _mm_mul_ps(wvec8_11, xj);
|
||||
wvec12_15 = _mm_mul_ps(wvec12_15, xj);
|
||||
|
||||
y0_3 = _mm_add_ps(y0_3, wvec0_3);
|
||||
y4_7 = _mm_add_ps(y4_7, wvec4_7);
|
||||
y8_11 = _mm_add_ps(y8_11, wvec8_11);
|
||||
y12_15 = _mm_add_ps(y12_15, wvec12_15);
|
||||
}
|
||||
|
||||
/* save y[0..15] back to memory */
|
||||
|
||||
_mm_storeu_ps(&y[0], y0_3);
|
||||
_mm_storeu_ps(&y[4], y4_7);
|
||||
_mm_storeu_ps(&y[8], y8_11);
|
||||
_mm_storeu_ps(&y[12], y12_15);
|
||||
}
|
||||
}
|
||||
|
||||
static void sparse_sgemv_accum16(float *out, const float *w, int rows, const int *idx, const float *x)
|
||||
{
|
||||
int i, j;
|
||||
for (i=0;i<rows;i+=16)
|
||||
{
|
||||
int cols;
|
||||
cols = *idx++;
|
||||
float * restrict y = &out[i];
|
||||
|
||||
/* keep y[0..15] in registers for duration of inner loop */
|
||||
|
||||
__m128 y0_3 = _mm_loadu_ps(&y[0]);
|
||||
__m128 y4_7 = _mm_loadu_ps(&y[4]);
|
||||
__m128 y8_11 = _mm_loadu_ps(&y[8]);
|
||||
__m128 y12_15 = _mm_loadu_ps(&y[12]);
|
||||
|
||||
for (j=0;j<cols;j++)
|
||||
{
|
||||
__m128 wvec;
|
||||
__m128 xj = _mm_set1_ps(x[*idx++]);
|
||||
|
||||
wvec = _mm_loadu_ps(&w[0]);
|
||||
wvec = _mm_mul_ps(wvec, xj);
|
||||
y0_3 = _mm_add_ps(y0_3, wvec);
|
||||
|
||||
wvec = _mm_loadu_ps(&w[4]);
|
||||
wvec = _mm_mul_ps(wvec, xj);
|
||||
y4_7 = _mm_add_ps(y4_7, wvec);
|
||||
|
||||
wvec = _mm_loadu_ps(&w[8]);
|
||||
wvec = _mm_mul_ps(wvec, xj);
|
||||
y8_11 = _mm_add_ps(y8_11, wvec);
|
||||
|
||||
wvec = _mm_loadu_ps(&w[12]);
|
||||
wvec = _mm_mul_ps(wvec, xj);
|
||||
y12_15 = _mm_add_ps(y12_15, wvec);
|
||||
|
||||
w += 16;
|
||||
}
|
||||
|
||||
/* save y[0..15] back to memory */
|
||||
|
||||
_mm_storeu_ps(&y[0], y0_3);
|
||||
_mm_storeu_ps(&y[4], y4_7);
|
||||
_mm_storeu_ps(&y[8], y8_11);
|
||||
_mm_storeu_ps(&y[12], y12_15);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue