mirror/kissfft
1
0
Fork 0
mirror of https://github.com/mborgerding/kissfft.git synced 2025-05-27 21:20:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Mark Borgerding 2005-10-07 12:29:36 +00:00
parent f492f40cb7
commit 18d0ad1604
6 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -5,11 +5,11 @@ TARBALL=kiss_fft_v$(KFVER).tar.gz
ZIPFILE=kiss_fft_v$(KFVER).zip ZIPFILE=kiss_fft_v$(KFVER).zip
testall: testall:
# The simd and long types may or may not work on your machine # The simd and int32_t types may or may not work on your machine
#export DATATYPE=simd && cd test && make test export DATATYPE=simd && cd test && make test
#export DATATYPE=long && cd test && make test export DATATYPE=int32_t && cd test && make test
export DATATYPE=short && cd test && make test export DATATYPE=int16_t && cd test && make test
export DATATYPE=float && cd test && make test export DATATYPE=float && cd test && make test
export DATATYPE=double && cd test && make test export DATATYPE=double && cd test && make test

15
_kiss_fft_guts.h
View File

@ -44,16 +44,15 @@ struct kiss_fft_state{
#ifdef FIXED_POINT #ifdef FIXED_POINT
#if (FIXED_POINT==32) #if (FIXED_POINT==32)
# define FRACBITS 31 # define FRACBITS 31
# define SAMPPROD long long # define SAMPPROD int64_t
#define SAMP_MAX LONG_MAX #define SAMP_MAX 2147483647
#define SAMP_MIN LONG_MIN
#else #else
# define FRACBITS 15 # define FRACBITS 15
# define SAMPPROD long # define SAMPPROD int32_t
#define SAMP_MAX SHRT_MAX #define SAMP_MAX 32767
#define SAMP_MIN SHRT_MIN
#endif #endif
#define SAMP_MIN -SAMP_MAX
#if defined(CHECK_OVERFLOW) #if defined(CHECK_OVERFLOW)
# define CHECK_OVERFLOW_OP(a,op,b) \ # define CHECK_OVERFLOW_OP(a,op,b) \
@ -126,8 +125,8 @@ struct kiss_fft_state{
#ifdef FIXED_POINT #ifdef FIXED_POINT
# define KISS_FFT_COS(phase) (kiss_fft_scalar) (SAMP_MAX * cos (phase)) # define KISS_FFT_COS(phase) floor(.5+SAMP_MAX * cos (phase))
# define KISS_FFT_SIN(phase) (kiss_fft_scalar) (SAMP_MAX * sin (phase)) # define KISS_FFT_SIN(phase) floor(.5+SAMP_MAX * sin (phase))
# define HALF_OF(x) ((x)>>1) # define HALF_OF(x) ((x)>>1)
#elif defined(USE_SIMD) #elif defined(USE_SIMD)
# define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) ) # define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) )

5
kiss_fft.h
View File

@ -34,10 +34,11 @@ extern "C" {
#ifdef FIXED_POINT #ifdef FIXED_POINT
#include <sys/types.h>
# if (FIXED_POINT == 32) # if (FIXED_POINT == 32)
# define kiss_fft_scalar long # define kiss_fft_scalar int32_t
# else # else
# define kiss_fft_scalar short # define kiss_fft_scalar int16_t
# endif # endif
#else #else
# ifndef kiss_fft_scalar # ifndef kiss_fft_scalar

4
test/Makefile
View File

@ -26,11 +26,11 @@ SELFTESTSRC=twotonetest.c
TYPEFLAGS=-Dkiss_fft_scalar=$(DATATYPE) TYPEFLAGS=-Dkiss_fft_scalar=$(DATATYPE)
ifeq "$(DATATYPE)" "short" ifeq "$(DATATYPE)" "int16_t"
TYPEFLAGS=-DFIXED_POINT=16 TYPEFLAGS=-DFIXED_POINT=16
endif endif
ifeq "$(DATATYPE)" "long" ifeq "$(DATATYPE)" "int32_t"
TYPEFLAGS=-DFIXED_POINT=32 TYPEFLAGS=-DFIXED_POINT=32
endif endif

25
test/testkiss.py
View File

@ -18,16 +18,24 @@ doreal=0
datatype = os.environ.get('DATATYPE','float') datatype = os.environ.get('DATATYPE','float')
util = '../tools/fft' util = '../tools/fft_' + datatype
fmt='f'
minsnr=90 minsnr=90
if datatype == 'double': if datatype == 'double':
util = '../tools/fft_double'
fmt='d' fmt='d'
elif datatype=='short': elif datatype=='int16_t':
util = '../tools/fft_short'
fmt='h' fmt='h'
minsnr=10 minsnr=10
elif datatype=='int32_t':
fmt='l'
elif datatype=='simd':
fmt='4f'
sys.stderr.write('testkiss.py does not yet test simd')
sys.exit(0)
elif datatype=='float':
fmt='f'
else:
sys.stderr.write('unrecognized datatype %s\n' % datatype)
sys.exit(1)
def dopack(x,cpx=1): def dopack(x,cpx=1):
@ -73,7 +81,7 @@ def randmat( ndims ):
def test_fft(ndims): def test_fft(ndims):
if ndims == 1: if ndims == 1:
nfft = int(random.uniform(50,520)) nfft = int(random.uniform(50,100))
if doreal: if doreal:
nfft = int(nfft/2)*2 nfft = int(nfft/2)*2
@ -108,9 +116,12 @@ def dofft(x):
iscomp = (type(x[0]) == complex) iscomp = (type(x[0]) == complex)
scale=1 scale=1
if datatype=='short': if datatype=='int16_t':
x = 32767 * x x = 32767 * x
scale = len(x) / 32767.0 scale = len(x) / 32767.0
elif datatype=='int32_t':
x = 2147483647.0 * x
scale = len(x) / 2147483647.0
cmd='%s -n ' % util cmd='%s -n ' % util
cmd += ','.join([str(d) for d in dims]) cmd += ','.join([str(d) for d in dims])

22
tools/Makefile
View File

@ -6,11 +6,11 @@ ifeq "$(DATATYPE)" ""
DATATYPE=float DATATYPE=float
endif endif
ifeq "$(DATATYPE)" "long" ifeq "$(DATATYPE)" "int32_t"
TYPEFLAGS=-DFIXED_POINT=32 TYPEFLAGS=-DFIXED_POINT=32
endif endif
ifeq "$(DATATYPE)" "short" ifeq "$(DATATYPE)" "int16_t"
TYPEFLAGS=-DFIXED_POINT=16 TYPEFLAGS=-DFIXED_POINT=16
endif endif
@ -23,19 +23,11 @@ ifeq "$(TYPEFLAGS)" ""
endif endif
ifeq "$(DATATYPE)" "float" FFTUTIL=fft_$(DATATYPE)
FFTUTIL=fft FASTFILT=fastconv_$(DATATYPE)
FASTFILT=fastconv FASTFILTREAL=fastconvr_$(DATATYPE)
FASTFILTREAL=fastconvr PSDPNG=psdpng_$(DATATYPE)
PSDPNG=psdpng DUMPHDR=dumphdr_$(DATATYPE)
DUMPHDR=dumphdr
else
FFTUTIL=fft_$(DATATYPE)
FASTFILT=fastconv_$(DATATYPE)
FASTFILTREAL=fastconvr_$(DATATYPE)
PSDPNG=psdpng_$(DATATYPE)
DUMPHDR=dumphdr_$(DATATYPE)
endif
all: $(FFTUTIL) $(FASTFILT) $(FASTFILTREAL) all: $(FFTUTIL) $(FASTFILT) $(FASTFILTREAL)
# $(PSDPNG) # $(PSDPNG)