VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed USE_SIMD flag to USE_SSE

This commit is contained in:
f4exb 2016-11-06 02:08:38 +01:00
parent af0a0896d4
commit dbbbfa12ee
12 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -62,7 +62,7 @@ if (NOT BUILD_DEBIAN)
endif() endif()
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|x86") IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|x86")
SET(USE_SIMD "SSE2" CACHE STRING "Use SIMD instructions") SET(USE_SSE "SSE4_1" CACHE STRING "Use SSE 4.1 SIMD instructions")
ENDIF() ENDIF()
# MacOS Compatibility # MacOS Compatibility
@ -411,17 +411,17 @@ include_directories(
${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}
) )
if(USE_SIMD MATCHES SSE2) if(USE_SSE MATCHES SSE4_1)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -msse4.1" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -msse4.1" )
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -msse4.1" ) set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -msse4.1" )
add_definitions(-DUSE_SIMD) add_definitions(-DUSE_SSE)
elseif(MSVC) elseif(MSVC)
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSE2" ) set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSE4_1" )
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSE2" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSE4_1" )
set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" ) set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
add_definitions (/D "_CRT_SECURE_NO_WARNINGS") add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
add_definitions(-DUSE_SIMD) add_definitions(-DUSE_SSE)
endif() endif()
endif() endif()

2
plugins/channeltx/modam/modam.pro
View File

@ -13,7 +13,7 @@ TARGET = modam
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase INCLUDEPATH += ../../../sdrbase
DEFINES += USE_SIMD=1 DEFINES += USE_SSE=1
QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -msse4.1
CONFIG(Release):build_subdir = release CONFIG(Release):build_subdir = release

2
plugins/samplesource/sdrdaemonfec/CMakeLists.txt
View File

@ -19,6 +19,7 @@ if(USE_SIMD MATCHES SSSE3)
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mssse3" ) set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mssse3" )
message(STATUS "SDRdaemonFEC: g++ SSSE3") message(STATUS "SDRdaemonFEC: g++ SSSE3")
add_definitions(-DUSE_SIMD) add_definitions(-DUSE_SIMD)
add_definitions(-DUSE_SSE)
elseif(MSVC) elseif(MSVC)
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSSE3" ) set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSSE3" )
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSSE3" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSSE3" )
@ -26,6 +27,7 @@ if(USE_SIMD MATCHES SSSE3)
message(STATUS "SDRdaemonFEC: MSVC SSSE3") message(STATUS "SDRdaemonFEC: MSVC SSSE3")
add_definitions (/D "_CRT_SECURE_NO_WARNINGS") add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
add_definitions(-DUSE_SIMD) add_definitions(-DUSE_SIMD)
add_definitions(-DUSE_SSE)
endif() endif()
elseif(USE_SIMD MATCHES NEON) elseif(USE_SIMD MATCHES NEON)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)

1
plugins/samplesource/sdrdaemonfec/sdrdaemonfec.pro
View File

@ -24,6 +24,7 @@ INCLUDEPATH += $$LIBNANOMSGSRC/src
INCLUDEPATH += $$LIBCM256CCSRC INCLUDEPATH += $$LIBCM256CCSRC
DEFINES += USE_SIMD=1 DEFINES += USE_SIMD=1
DEFINES += USE_SSE=1
QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -msse4.1
CONFIG(Release):build_subdir = release CONFIG(Release):build_subdir = release

4
sdrbase/dsp/decimators.h
View File

@ -18,7 +18,7 @@
#define INCLUDE_GPL_DSP_DECIMATORS_H_ #define INCLUDE_GPL_DSP_DECIMATORS_H_
#include "dsp/dsptypes.h" #include "dsp/dsptypes.h"
#ifdef USE_SIMD #ifdef USE_SSE
#include "dsp/inthalfbandfiltereo1.h" #include "dsp/inthalfbandfiltereo1.h"
#else #else
#include "dsp/inthalfbandfilterdb.h" #include "dsp/inthalfbandfilterdb.h"
@ -124,7 +124,7 @@ public:
void decimate64_cen(SampleVector::iterator* it, const T* buf, qint32 len); void decimate64_cen(SampleVector::iterator* it, const T* buf, qint32 len);
private: private:
#ifdef USE_SIMD #ifdef USE_SSE
IntHalfbandFilterEO1<DECIMATORS_HB_FILTER_ORDER> m_decimator2; // 1st stages IntHalfbandFilterEO1<DECIMATORS_HB_FILTER_ORDER> m_decimator2; // 1st stages
IntHalfbandFilterEO1<DECIMATORS_HB_FILTER_ORDER> m_decimator4; // 2nd stages IntHalfbandFilterEO1<DECIMATORS_HB_FILTER_ORDER> m_decimator4; // 2nd stages
IntHalfbandFilterEO1<DECIMATORS_HB_FILTER_ORDER> m_decimator8; // 3rd stages IntHalfbandFilterEO1<DECIMATORS_HB_FILTER_ORDER> m_decimator8; // 3rd stages

4
sdrbase/dsp/interpolator.h
View File

@ -1,7 +1,7 @@
#ifndef INCLUDE_INTERPOLATOR_H #ifndef INCLUDE_INTERPOLATOR_H
#define INCLUDE_INTERPOLATOR_H #define INCLUDE_INTERPOLATOR_H
#ifdef USE_SIMD #ifdef USE_SSE
#include <immintrin.h> #include <immintrin.h>
#endif #endif
#include "dsp/dsptypes.h" #include "dsp/dsptypes.h"
@ -125,7 +125,7 @@ private:
{ {
if (phase < 0) if (phase < 0)
phase = 0; phase = 0;
#if USE_SIMD #if USE_SSE
// beware of the ringbuffer // beware of the ringbuffer
if(m_ptr == 0) { if(m_ptr == 0) {
// only one straight block // only one straight block

6
sdrbase/dsp/inthalfbandfiltereo1.h
View File

@ -22,7 +22,7 @@
#ifndef SDRBASE_DSP_INTHALFBANDFILTEREO_H_ #ifndef SDRBASE_DSP_INTHALFBANDFILTEREO_H_
#define SDRBASE_DSP_INTHALFBANDFILTEREO_H_ #define SDRBASE_DSP_INTHALFBANDFILTEREO_H_
#ifdef USE_SIMD #ifdef USE_SSE
#include <smmintrin.h> #include <smmintrin.h>
#endif #endif
@ -464,7 +464,7 @@ protected:
qint32 iAcc = 0; qint32 iAcc = 0;
qint32 qAcc = 0; qint32 qAcc = 0;
#ifdef USE_SIMD #ifdef USE_SSE
//#warning "IntHalfbandFiler SIMD" //#warning "IntHalfbandFiler SIMD"
const __m128i* h = (const __m128i*) HBFIRFilterTraits<HBFilterOrder>::hbCoeffs; const __m128i* h = (const __m128i*) HBFIRFilterTraits<HBFilterOrder>::hbCoeffs;
__m128i sumI = _mm_setzero_si128(); __m128i sumI = _mm_setzero_si128();
@ -551,7 +551,7 @@ protected:
qint32 iAcc = 0; qint32 iAcc = 0;
qint32 qAcc = 0; qint32 qAcc = 0;
#ifdef USE_SIMD #ifdef USE_SSE
const __m128i* h = (const __m128i*) HBFIRFilterTraits<HBFilterOrder>::hbCoeffs; const __m128i* h = (const __m128i*) HBFIRFilterTraits<HBFilterOrder>::hbCoeffs;
__m128i sumI = _mm_setzero_si128(); __m128i sumI = _mm_setzero_si128();
__m128i sumQ = _mm_setzero_si128(); __m128i sumQ = _mm_setzero_si128();

6
sdrbase/dsp/inthalfbandfiltereo2.h
View File

@ -22,7 +22,7 @@
#ifndef SDRBASE_DSP_INTHALFBANDFILTEREO2_H_ #ifndef SDRBASE_DSP_INTHALFBANDFILTEREO2_H_
#define SDRBASE_DSP_INTHALFBANDFILTEREO2_H_ #define SDRBASE_DSP_INTHALFBANDFILTEREO2_H_
#ifdef USE_SIMD #ifdef USE_SSE
#include <smmintrin.h> #include <smmintrin.h>
#endif #endif
@ -484,7 +484,7 @@ protected:
qint32 iAcc = 0; qint32 iAcc = 0;
qint32 qAcc = 0; qint32 qAcc = 0;
#ifdef USE_SIMD #ifdef USE_SSE
//#warning "IntHalfbandFiler SIMD" //#warning "IntHalfbandFiler SIMD"
const __m128i* h = (const __m128i*) HBFIRFilterTraits<HBFilterOrder>::hbCoeffs; const __m128i* h = (const __m128i*) HBFIRFilterTraits<HBFilterOrder>::hbCoeffs;
__m128i sumI = _mm_setzero_si128(); __m128i sumI = _mm_setzero_si128();
@ -570,7 +570,7 @@ protected:
qint32 iAcc = 0; qint32 iAcc = 0;
qint32 qAcc = 0; qint32 qAcc = 0;
#ifdef USE_SIMD #ifdef USE_SSE
//#warning "IntHalfbandFiler SIMD" //#warning "IntHalfbandFiler SIMD"
const __m128i* h = (const __m128i*) HBFIRFilterTraits<HBFilterOrder>::hbCoeffs; const __m128i* h = (const __m128i*) HBFIRFilterTraits<HBFilterOrder>::hbCoeffs;
__m128i sumI = _mm_setzero_si128(); __m128i sumI = _mm_setzero_si128();

2
sdrbase/dsp/upchannelizer.cpp
View File

@ -201,7 +201,7 @@ void UpChannelizer::applyConfiguration()
} }
} }
#ifdef USE_SIMD #ifdef USE_SSE
UpChannelizer::FilterStage::FilterStage(Mode mode) : UpChannelizer::FilterStage::FilterStage(Mode mode) :
m_filter(new IntHalfbandFilterEO2<UPCHANNELIZER_HB_FILTER_ORDER>), m_filter(new IntHalfbandFilterEO2<UPCHANNELIZER_HB_FILTER_ORDER>),
m_workFunction(0) m_workFunction(0)

4
sdrbase/dsp/upchannelizer.h
View File

@ -23,7 +23,7 @@
#include <QMutex> #include <QMutex>
#include "util/export.h" #include "util/export.h"
#include "util/message.h" #include "util/message.h"
#ifdef USE_SIMD #ifdef USE_SSE
#include "dsp/inthalfbandfiltereo2.h" #include "dsp/inthalfbandfiltereo2.h"
#else #else
#include "dsp/inthalfbandfilterdb.h" #include "dsp/inthalfbandfilterdb.h"
@ -73,7 +73,7 @@ protected:
ModeUpperHalf ModeUpperHalf
}; };
#ifdef USE_SIMD #ifdef USE_SSE
typedef bool (IntHalfbandFilterEO2<UPCHANNELIZER_HB_FILTER_ORDER>::*WorkFunction)(Sample* sIn, Sample *sOut); typedef bool (IntHalfbandFilterEO2<UPCHANNELIZER_HB_FILTER_ORDER>::*WorkFunction)(Sample* sIn, Sample *sOut);
IntHalfbandFilterEO2<UPCHANNELIZER_HB_FILTER_ORDER>* m_filter; IntHalfbandFilterEO2<UPCHANNELIZER_HB_FILTER_ORDER>* m_filter;
#else #else

4
sdrbase/gui/glspectrum.cpp
View File

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#ifdef USE_SIMD #ifdef USE_SSE
#include <immintrin.h> #include <immintrin.h>
#endif #endif
@ -381,7 +381,7 @@ void GLSpectrum::updateHistogram(const std::vector<Real>& spectrum)
m_currentSpectrum = &spectrum; // Store spectrum for current spectrum line display m_currentSpectrum = &spectrum; // Store spectrum for current spectrum line display
#ifndef USE_SIMD #ifndef USE_SSE
for(int i = 0; i < m_fftSize; i++) { for(int i = 0; i < m_fftSize; i++) {
int v = (int)((spectrum[i] - m_referenceLevel) * 100.0 / m_powerRange + 100.0); int v = (int)((spectrum[i] - m_referenceLevel) * 100.0 / m_powerRange + 100.0);

2
sdrbase/sdrbase.pro
View File

@ -14,7 +14,7 @@ INCLUDEPATH += $$PWD
DEFINES += USE_KISSFFT=1 DEFINES += USE_KISSFFT=1
DEFINES += __WINDOWS__=1 DEFINES += __WINDOWS__=1
DEFINES += DSD_USE_SERIALDV=1 DEFINES += DSD_USE_SERIALDV=1
DEFINES += USE_SIMD=1 DEFINES += USE_SSE=1
QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -msse4.1
CONFIG(Release):build_subdir = release CONFIG(Release):build_subdir = release