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

simplified testing (hopefully)

Browse Source
This commit is contained in:
Mark Borgerding 2003-08-13 01:54:21 +00:00
parent f906b47946
commit 1cd00ce9f5
3 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
test/Makefile
View File

@ -1,58 +1,42 @@
NFFT=256 NFFT=1024
ALLUTILS=kfft kifft kffts kiffts kfftd kifftd s2f s2d sigdiff sigdiffs sigdiffd scale scales scaled ALLUTILS=kfft kffts kfftd
NUMFFTS=1000 NUMFFTS=10000
UTILSRC=../kiss_fft.c fftutil.c UTILSRC=../kiss_fft.c fftutil.c
all: $(ALLUTILS) all: $(ALLUTILS)
kfft: $(UTILSRC) kfft: $(UTILSRC)
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) $(UTILSRC) gcc -Wall -O3 -o $@ -lm -I.. $(UTILSRC)
kifft: ../kiss_fft.h ../kiss_fft.c fftutil.c
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DINVERSE_FFT $(UTILSRC)
kffts: $(UTILSRC) kffts: $(UTILSRC)
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DFIXED_POINT $(UTILSRC) gcc -Wall -O3 -o $@ -lm -I.. -DFIXED_POINT $(UTILSRC)
kiffts: $(UTILSRC)
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DFIXED_POINT -DINVERSE_FFT $(UTILSRC)
kfftd: $(UTILSRC) kfftd: $(UTILSRC)
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -Dkiss_fft_scalar=double $(UTILSRC) gcc -Wall -O3 -o $@ -lm -I.. -Dkiss_fft_scalar=double $(UTILSRC)
kifftd: ../kiss_fft.h ../kiss_fft.c fftutil.c
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -Dkiss_fft_scalar=double -DINVERSE_FFT $(UTILSRC)
s2f: typeconvert.c time: all
gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=float @echo
s2d: typeconvert.c @echo "#### timing $(NUMFFTS) x $(NFFT) point FFTs"
gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=double @echo "#### DOUBLE"
@time -f 'Elapsed:%E user:%U sys:%S' \
sh -c 'dd if=/dev/zero bs=$$((16*$(NFFT))) count=$(NUMFFTS) 2>/dev/null |./kfftd>/dev/null'
@echo "#### FLOAT"
@time -f 'Elapsed:%E user:%U sys:%S' \
sh -c 'dd if=/dev/zero bs=$$((8*$(NFFT))) count=$(NUMFFTS) 2>/dev/null |./kfft>/dev/null'
@echo "#### SHORT"
@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'
scale: typeconvert.c snr: all
gcc -Wall -O3 -o $@ $^ -DTYPE1=float -DTYPE2=float @which octave
scales: typeconvert.c @echo
gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=short @echo "### testing SNR for $(NFFT) point FFTs"
scaled: typeconvert.c @echo "#### DOUBLE"
gcc -Wall -O3 -o $@ $^ -DTYPE1=double -DTYPE2=double @echo "testkiss($(NFFT),'double',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
sigdiff: sigdiff.c test: snr time
gcc -Wall -O3 -o $@ $^ -DTYPE=float -lm
sigdiffs: sigdiff.c
gcc -Wall -O3 -o $@ $^ -DTYPE=short -lm
sigdiffd: sigdiff.c
gcc -Wall -O3 -o $@ $^ -DTYPE=double -lm
randshort.dat:
dd if=/dev/urandom bs=$$((4 * $(NFFT) )) count=$(NUMFFTS) of=randshort.dat
randfloat.dat: randshort.dat s2f
./s2f < $< > $@
randdouble.dat: randshort.dat s2d
./s2d < $< > $@
data: randshort.dat randfloat.dat randdouble.dat
test: all data
@echo "####################Testing double fft|ifft"
@./kfftd < randdouble.dat | ./kifftd | ./scaled -d $(NFFT) | ./sigdiffd randdouble.dat -
@echo "####################Testing float fft|ifft"
./kfft < randfloat.dat | ./kifft | ./scale -d $(NFFT) | ./sigdiff randfloat.dat -
@echo "####################Testing short fft|ifft"
./kffts < randshort.dat | ./kiffts | ./scales -m $(NFFT) | ./sigdiffs randshort.dat -
clean: clean:
rm -f $(ALLUTILS) *.dat *~ rm -f $(ALLUTILS) *.dat *~

74
tools/Makefile
View File

@ -1,58 +1,42 @@
NFFT=256 NFFT=1024
ALLUTILS=kfft kifft kffts kiffts kfftd kifftd s2f s2d sigdiff sigdiffs sigdiffd scale scales scaled ALLUTILS=kfft kffts kfftd
NUMFFTS=1000 NUMFFTS=10000
UTILSRC=../kiss_fft.c fftutil.c UTILSRC=../kiss_fft.c fftutil.c
all: $(ALLUTILS) all: $(ALLUTILS)
kfft: $(UTILSRC) kfft: $(UTILSRC)
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) $(UTILSRC) gcc -Wall -O3 -o $@ -lm -I.. $(UTILSRC)
kifft: ../kiss_fft.h ../kiss_fft.c fftutil.c
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DINVERSE_FFT $(UTILSRC)
kffts: $(UTILSRC) kffts: $(UTILSRC)
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DFIXED_POINT $(UTILSRC) gcc -Wall -O3 -o $@ -lm -I.. -DFIXED_POINT $(UTILSRC)
kiffts: $(UTILSRC)
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DFIXED_POINT -DINVERSE_FFT $(UTILSRC)
kfftd: $(UTILSRC) kfftd: $(UTILSRC)
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -Dkiss_fft_scalar=double $(UTILSRC) gcc -Wall -O3 -o $@ -lm -I.. -Dkiss_fft_scalar=double $(UTILSRC)
kifftd: ../kiss_fft.h ../kiss_fft.c fftutil.c
gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -Dkiss_fft_scalar=double -DINVERSE_FFT $(UTILSRC)
s2f: typeconvert.c time: all
gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=float @echo
s2d: typeconvert.c @echo "#### timing $(NUMFFTS) x $(NFFT) point FFTs"
gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=double @echo "#### DOUBLE"
@time -f 'Elapsed:%E user:%U sys:%S' \
sh -c 'dd if=/dev/zero bs=$$((16*$(NFFT))) count=$(NUMFFTS) 2>/dev/null |./kfftd>/dev/null'
@echo "#### FLOAT"
@time -f 'Elapsed:%E user:%U sys:%S' \
sh -c 'dd if=/dev/zero bs=$$((8*$(NFFT))) count=$(NUMFFTS) 2>/dev/null |./kfft>/dev/null'
@echo "#### SHORT"
@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'
scale: typeconvert.c snr: all
gcc -Wall -O3 -o $@ $^ -DTYPE1=float -DTYPE2=float @which octave
scales: typeconvert.c @echo
gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=short @echo "### testing SNR for $(NFFT) point FFTs"
scaled: typeconvert.c @echo "#### DOUBLE"
gcc -Wall -O3 -o $@ $^ -DTYPE1=double -DTYPE2=double @echo "testkiss($(NFFT),'double',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
sigdiff: sigdiff.c test: snr time
gcc -Wall -O3 -o $@ $^ -DTYPE=float -lm
sigdiffs: sigdiff.c
gcc -Wall -O3 -o $@ $^ -DTYPE=short -lm
sigdiffd: sigdiff.c
gcc -Wall -O3 -o $@ $^ -DTYPE=double -lm
randshort.dat:
dd if=/dev/urandom bs=$$((4 * $(NFFT) )) count=$(NUMFFTS) of=randshort.dat
randfloat.dat: randshort.dat s2f
./s2f < $< > $@
randdouble.dat: randshort.dat s2d
./s2d < $< > $@
data: randshort.dat randfloat.dat randdouble.dat
test: all data
@echo "####################Testing double fft|ifft"
@./kfftd < randdouble.dat | ./kifftd | ./scaled -d $(NFFT) | ./sigdiffd randdouble.dat -
@echo "####################Testing float fft|ifft"
./kfft < randfloat.dat | ./kifft | ./scale -d $(NFFT) | ./sigdiff randfloat.dat -
@echo "####################Testing short fft|ifft"
./kffts < randshort.dat | ./kiffts | ./scales -m $(NFFT) | ./sigdiffs randshort.dat -
clean: clean:
rm -f $(ALLUTILS) *.dat *~ rm -f $(ALLUTILS) *.dat *~

62
tools/fftutil.c
View File

@ -16,6 +16,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <getopt.h>
#include "kiss_fft.h" #include "kiss_fft.h"
@ -23,25 +24,56 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
# define NFFT 1024 # define NFFT 1024
#endif #endif
void fft_file(FILE * fin,FILE * fout,int nfft,int isinverse)
{
void *st;
kiss_fft_cpx * buf;
buf = (kiss_fft_cpx*)malloc(sizeof(kiss_fft_cpx) * nfft );
st = kiss_fft_alloc( nfft ,isinverse );
while ( fread( buf , sizeof(kiss_fft_cpx) * nfft ,1, fin ) > 0 ) {
kiss_fft( st , buf );
fwrite( buf , sizeof(kiss_fft_cpx) , nfft , fout );
}
free(st);
free(buf);
}
int main(int argc,char ** argv) int main(int argc,char ** argv)
{ {
kiss_fft_cpx buf[NFFT]; int nfft=1024;
void *st; int isinverse=0;
FILE *fin=stdin;
#ifdef INVERSE_FFT FILE *fout=stdout;
int inverse_fft=1;
#else while (1) {
int inverse_fft=0; int c=getopt(argc,argv,"n:i");
#endif if (c==-1) break;
switch (c) {
st = kiss_fft_alloc( NFFT ,inverse_fft ); case 'n':nfft = atoi(optarg);break;
case 'i':isinverse=1;break;
while ( fread( buf , sizeof(kiss_fft_cpx) , NFFT , stdin ) > 0 ) { }
kiss_fft( st , buf );
fwrite( buf , sizeof(kiss_fft_cpx) , NFFT , stdout );
} }
free(st); if ( optind < argc ) {
if (strcmp("-",argv[optind]) !=0)
fin = fopen(argv[optind],"rb");
++optind;
}
if ( optind < argc ) {
if ( strcmp("-",argv[optind]) !=0 )
fout = fopen(argv[optind],"wb");
++optind;
}
fft_file(fin,fout,nfft,isinverse);
if (fout!=stdout) fclose(fout);
if (fin!=stdin) fclose(fin);
return 0; return 0;
} }