'make snr' now tests 2d ffts

This commit is contained in:
Mark Borgerding
2003-12-04 04:08:52 +00:00
parent f3c4a9e9ca
commit 39d2974fe3
6 changed files with 59 additions and 28 deletions

View File

@ -4,6 +4,8 @@ endif
ifeq "$(NUMFFTS)" ""
NUMFFTS=10000
endif
NROWS=30
ifeq "$(DATATYPE)" ""
DATATYPE=float
endif
@ -51,8 +53,8 @@ mtime: all $(BENCHFFTW)
done
snr: all
@echo "### testing SNR for $(NFFT) point $(DATATYPE) FFTs"
@echo "testkiss( $(NFFT) , '$(DATATYPE)' );" | octave -q
@echo "testkiss( $(NFFT) , 1, '$(DATATYPE)' );" | octave -q
@echo "testkiss( $(NFFT) , $(NROWS), '$(DATATYPE)' );" | octave -q
test: snr time fftw

View File

@ -43,7 +43,11 @@ void fft_file(FILE * fin,FILE * fout,int nfft,int nrows,int isinverse,int useasc
while ( fread( buf , sizeof(kiss_fft_cpx) * nfft * nrows ,1, fin ) > 0 ) {
for (i=0;i<times;++i)
kiss_fft( st , buf ,bufout);
if (nrows!=1)
kiss_fft2d( st , buf ,bufout);
else
kiss_fft( st , buf ,bufout);
if (useascii) {
int i;
for (i=0;i<nfft*nrows;++i)
@ -68,12 +72,12 @@ int main(int argc,char ** argv)
int nrows=1;
while (1) {
int c=getopt(argc,argv,"n:iax:c:");
int c=getopt(argc,argv,"n:iax:r:");
if (c==-1) break;
switch (c) {
case 'a':useascii=1;break;
case 'n':nfft = atoi(optarg);break;
case 'c':nrows = atoi(optarg);break;
case 'r':nrows = atoi(optarg);break;
case 'i':isinverse=1;break;
case 'x':times=atoi(optarg);break;
}