mirror/kissfft
1
0
Fork 0
mirror of https://github.com/mborgerding/kissfft.git synced 2025-06-03 09:08:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Woops, one should not test with input of all zeros

Browse Source
This commit is contained in:
Mark Borgerding 2003-10-29 04:29:01 +00:00
parent 97b18f3fef
commit ca4c74e07c
6 changed files with 96 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -7,5 +7,5 @@ tarball: clean
clean: clean:
cd sample_code && make clean cd sample_code && make clean
rm -f kiss_fft.tar.gz *~ *.pyc kiss_fft.zip rm -f kiss_fft.tar.gz *~ *.pyc kiss_fft.zip fft.py

4
kiss_fft.c
View File

@ -269,8 +269,8 @@ void * kiss_fft_alloc(int nfft,int inverse_fft)
} }
while (nfft>1) { while (nfft>1) {
/* If you add a new radix, don't forget to put it here */ /* If you want a new radix, don't forget to put it here */
const int primes[] = {4,2,-1}; const int primes[] = {4,2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,-1};
int p=nfft; int p=nfft;
i=0; i=0;
while ( primes[i] != -1 ) { while ( primes[i] != -1 ) {

63
test/Makefile
View File

@ -3,7 +3,6 @@ ifeq "$(NFFT)" ""
NFFT=1024 NFFT=1024
endif endif
ALLUTILS=kfft kffts kfftd
ifeq "$(NUMFFTS)" "" ifeq "$(NUMFFTS)" ""
NUMFFTS=10000 NUMFFTS=10000
@ -13,50 +12,54 @@ UTILSRC=../kiss_fft.c fftutil.c
CFLAGS=-Wall -O3 -lm -I.. -ansi -pedantic CFLAGS=-Wall -O3 -lm -I.. -ansi -pedantic
all: $(ALLUTILS) ifeq "$(DATATYPE)" ""
DATATYPE=float
endif
UTIL=fftutil_$(DATATYPE)
kfft: $(UTILSRC)
echo $(FUNCDECL)
gcc -o $@ $(CFLAGS) $(UTILSRC)
kffts: $(UTILSRC)
gcc -o $@ $(CFLAGS) -DFIXED_POINT $(UTILSRC)
kfftd: $(UTILSRC)
gcc -o $@ $(CFLAGS) -Dkiss_fft_scalar=double $(UTILSRC)
time: all all: $(UTIL)
@echo
ifeq "$(DATATYPE)" "short"
TYPEFLAGS=-DFIXED_POINT -Dkiss_fft_scalar=short
else
TYPEFLAGS=-Dkiss_fft_scalar=$(DATATYPE)
endif
$(UTIL): $(UTILSRC)
gcc -o $@ $(CFLAGS) $(TYPEFLAGS) $(UTILSRC)
RANDDAT=rand_$(DATATYPE)_$(NUMFFTS)_$(NFFT).dat
$(RANDDAT):
./rand_fft_data.py -n $(NUMFFTS) -N $(NFFT) -t $(DATATYPE) > $(RANDDAT)
time: all $(RANDDAT)
@echo
@echo -n "#### timing $(NUMFFTS) x $(NFFT) point FFTs. "; factor $(NFFT) @echo -n "#### timing $(NUMFFTS) x $(NFFT) point FFTs. "; factor $(NFFT)
@echo "#### DOUBLE" @if [ -x ~/fftw/st ] && [ $(DATATYPE) == "double" ]; then \
@time -f 'Elapsed:%E user:%U sys:%S' \ echo "#### FFTW FFT $(DATATYPE)"; \
sh -c 'dd if=/dev/zero bs=$$((16*$(NFFT))) count=$(NUMFFTS) 2>/dev/null |./kfftd>/dev/null' time ~/fftw/st -n $(NFFT) < $(RANDDAT) > /dev/null;\
@echo "#### FLOAT" fi
@time -f 'Elapsed:%E user:%U sys:%S' \ @echo "#### KISS FFT $(DATATYPE)"
sh -c 'dd if=/dev/zero bs=$$((8*$(NFFT))) count=$(NUMFFTS) 2>/dev/null |./kfft>/dev/null' @time ./$(UTIL) -n $(NFFT) < $(RANDDAT) > /dev/null
@echo "#### SHORT" @rm $(RANDDAT)
@time -f 'Elapsed:%E user:%U sys:%S' \
sh -c 'dd if=/dev/zero bs=$$((4*$(NFFT))) count=$(NUMFFTS) 2>/dev/null |./kffts>/dev/null'
POW2=256 512 1024 2048 POW2=256 512 1024 2048
POW3=243 729 2187 POW3=243 729 2187
mtime: all mtime: all
@for n in $(POW2) ;do \ @for n in $(POW2) $(POW3) ;do \
export NFFT=$$n;make time; \ export NFFT=$$n;make time; \
done done
snr: all snr: all
@which octave @which octave
@echo @echo
@echo "### testing SNR for $(NFFT) point FFTs" @echo "### testing SNR for $(NFFT) point FFTs"
@echo "#### DOUBLE" @echo "#### $(DATATYPE)"
@echo "testkiss($(NFFT),'double',1,1/$(NFFT));" | octave -q @echo "testkiss($(NFFT),'$(DATATYPE)',1,1/$(NFFT));" | octave -q
@echo "#### FLOAT"
@echo "testkiss($(NFFT),'float',1,1/$(NFFT));" | octave -q
@echo "#### SHORT"
@echo "testkiss($(NFFT),'short',$(NFFT),$(NFFT));" | octave -q
test: snr time test: snr time
clean: clean:
rm -f $(ALLUTILS) *.dat *~ rm -f *.dat *~ fftutil_*

26
test/rand_fft_data.py Executable file
View File

@ -0,0 +1,26 @@
#!/usr/local/bin/python2.3
import sys
import random
import struct
def main():
from getopt import getopt
opts,args = getopt(sys.argv[1:],'n:N:t:l:h:')
opts=dict(opts)
nbufs = int( opts.get('-n','10000') )
nfft = int( opts.get('-N','1024') )
type = opts.get('-t','f')
lo = float(opts.get('-l','-32768') )
hi = float(opts.get('-h','32767') )
format = {'float':'f','short':'h','double':'d'}[type]
nums = [ random.uniform(lo,hi) for i in range(nfft*2) ]
buf = struct.pack( '%d%s' % ( len( nums ) , format ) , *nums )
for i in range(nbufs):
sys.stdout.write( buf )
if __name__ == '__main__':
main()

8
test/testkiss.m
View File

@ -8,13 +8,7 @@ endif
if nargin<4, scale_f2t=1 if nargin<4, scale_f2t=1
endif endif
if strcmp(prec,'short'), kfft= sprintf('./fftutil_%s',prec);
kfft='./kffts';
elseif strcmp(prec,'double')
kfft='./kfftd';
else
kfft='./kfft';
endif
siglen = nfft; siglen = nfft;
sig=floor(32767*rand(1,siglen)) + j*floor(32767*rand(1,siglen)); sig=floor(32767*rand(1,siglen)) + j*floor(32767*rand(1,siglen));

63
tools/Makefile
View File

@ -3,7 +3,6 @@ ifeq "$(NFFT)" ""
NFFT=1024 NFFT=1024
endif endif
ALLUTILS=kfft kffts kfftd
ifeq "$(NUMFFTS)" "" ifeq "$(NUMFFTS)" ""
NUMFFTS=10000 NUMFFTS=10000
@ -13,50 +12,54 @@ UTILSRC=../kiss_fft.c fftutil.c
CFLAGS=-Wall -O3 -lm -I.. -ansi -pedantic CFLAGS=-Wall -O3 -lm -I.. -ansi -pedantic
all: $(ALLUTILS) ifeq "$(DATATYPE)" ""
DATATYPE=float
endif
UTIL=fftutil_$(DATATYPE)
kfft: $(UTILSRC)
echo $(FUNCDECL)
gcc -o $@ $(CFLAGS) $(UTILSRC)
kffts: $(UTILSRC)
gcc -o $@ $(CFLAGS) -DFIXED_POINT $(UTILSRC)
kfftd: $(UTILSRC)
gcc -o $@ $(CFLAGS) -Dkiss_fft_scalar=double $(UTILSRC)
time: all all: $(UTIL)
@echo
ifeq "$(DATATYPE)" "short"
TYPEFLAGS=-DFIXED_POINT -Dkiss_fft_scalar=short
else
TYPEFLAGS=-Dkiss_fft_scalar=$(DATATYPE)
endif
$(UTIL): $(UTILSRC)
gcc -o $@ $(CFLAGS) $(TYPEFLAGS) $(UTILSRC)
RANDDAT=rand_$(DATATYPE)_$(NUMFFTS)_$(NFFT).dat
$(RANDDAT):
./rand_fft_data.py -n $(NUMFFTS) -N $(NFFT) -t $(DATATYPE) > $(RANDDAT)
time: all $(RANDDAT)
@echo
@echo -n "#### timing $(NUMFFTS) x $(NFFT) point FFTs. "; factor $(NFFT) @echo -n "#### timing $(NUMFFTS) x $(NFFT) point FFTs. "; factor $(NFFT)
@echo "#### DOUBLE" @if [ -x ~/fftw/st ] && [ $(DATATYPE) == "double" ]; then \
@time -f 'Elapsed:%E user:%U sys:%S' \ echo "#### FFTW FFT $(DATATYPE)"; \
sh -c 'dd if=/dev/zero bs=$$((16*$(NFFT))) count=$(NUMFFTS) 2>/dev/null |./kfftd>/dev/null' time ~/fftw/st -n $(NFFT) < $(RANDDAT) > /dev/null;\
@echo "#### FLOAT" fi
@time -f 'Elapsed:%E user:%U sys:%S' \ @echo "#### KISS FFT $(DATATYPE)"
sh -c 'dd if=/dev/zero bs=$$((8*$(NFFT))) count=$(NUMFFTS) 2>/dev/null |./kfft>/dev/null' @time ./$(UTIL) -n $(NFFT) < $(RANDDAT) > /dev/null
@echo "#### SHORT" @rm $(RANDDAT)
@time -f 'Elapsed:%E user:%U sys:%S' \
sh -c 'dd if=/dev/zero bs=$$((4*$(NFFT))) count=$(NUMFFTS) 2>/dev/null |./kffts>/dev/null'
POW2=256 512 1024 2048 POW2=256 512 1024 2048
POW3=243 729 2187 POW3=243 729 2187
mtime: all mtime: all
@for n in $(POW2) ;do \ @for n in $(POW2) $(POW3) ;do \
export NFFT=$$n;make time; \ export NFFT=$$n;make time; \
done done
snr: all snr: all
@which octave @which octave
@echo @echo
@echo "### testing SNR for $(NFFT) point FFTs" @echo "### testing SNR for $(NFFT) point FFTs"
@echo "#### DOUBLE" @echo "#### $(DATATYPE)"
@echo "testkiss($(NFFT),'double',1,1/$(NFFT));" | octave -q @echo "testkiss($(NFFT),'$(DATATYPE)',1,1/$(NFFT));" | octave -q
@echo "#### FLOAT"
@echo "testkiss($(NFFT),'float',1,1/$(NFFT));" | octave -q
@echo "#### SHORT"
@echo "testkiss($(NFFT),'short',$(NFFT),$(NFFT));" | octave -q
test: snr time test: snr time
clean: clean:
rm -f $(ALLUTILS) *.dat *~ rm -f *.dat *~ fftutil_*