mirror of
				https://github.com/mborgerding/kissfft.git
				synced 2025-11-03 16:54:55 -05:00 
			
		
		
		
	simplified testing (hopefully)
This commit is contained in:
		@ -1,58 +1,42 @@
 | 
			
		||||
NFFT=256
 | 
			
		||||
ALLUTILS=kfft kifft kffts kiffts kfftd kifftd s2f s2d sigdiff sigdiffs sigdiffd scale scales scaled 
 | 
			
		||||
NUMFFTS=1000
 | 
			
		||||
NFFT=1024
 | 
			
		||||
ALLUTILS=kfft kffts kfftd
 | 
			
		||||
NUMFFTS=10000
 | 
			
		||||
UTILSRC=../kiss_fft.c fftutil.c
 | 
			
		||||
 | 
			
		||||
all: $(ALLUTILS)
 | 
			
		||||
 | 
			
		||||
kfft: $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) $(UTILSRC)
 | 
			
		||||
kifft: ../kiss_fft.h ../kiss_fft.c fftutil.c
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DINVERSE_FFT $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. $(UTILSRC)
 | 
			
		||||
kffts: $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DFIXED_POINT $(UTILSRC)
 | 
			
		||||
kiffts: $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DFIXED_POINT -DINVERSE_FFT $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DFIXED_POINT $(UTILSRC)
 | 
			
		||||
kfftd: $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -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)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -Dkiss_fft_scalar=double $(UTILSRC)
 | 
			
		||||
 | 
			
		||||
s2f: typeconvert.c
 | 
			
		||||
	gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=float 
 | 
			
		||||
s2d: typeconvert.c
 | 
			
		||||
	gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=double 
 | 
			
		||||
time: all
 | 
			
		||||
	@echo 
 | 
			
		||||
	@echo "#### timing $(NUMFFTS) x $(NFFT) point FFTs"
 | 
			
		||||
	@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
 | 
			
		||||
	gcc -Wall -O3 -o $@ $^ -DTYPE1=float -DTYPE2=float 
 | 
			
		||||
scales: typeconvert.c
 | 
			
		||||
	gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=short 
 | 
			
		||||
scaled: typeconvert.c
 | 
			
		||||
	gcc -Wall -O3 -o $@ $^ -DTYPE1=double -DTYPE2=double 
 | 
			
		||||
snr: all
 | 
			
		||||
	@which octave
 | 
			
		||||
	@echo
 | 
			
		||||
	@echo "### testing SNR for  $(NFFT) point FFTs"
 | 
			
		||||
	@echo "#### 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
 | 
			
		||||
	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 -
 | 
			
		||||
test: snr time 
 | 
			
		||||
 | 
			
		||||
clean:
 | 
			
		||||
	rm -f $(ALLUTILS) *.dat *~
 | 
			
		||||
 | 
			
		||||
@ -1,58 +1,42 @@
 | 
			
		||||
NFFT=256
 | 
			
		||||
ALLUTILS=kfft kifft kffts kiffts kfftd kifftd s2f s2d sigdiff sigdiffs sigdiffd scale scales scaled 
 | 
			
		||||
NUMFFTS=1000
 | 
			
		||||
NFFT=1024
 | 
			
		||||
ALLUTILS=kfft kffts kfftd
 | 
			
		||||
NUMFFTS=10000
 | 
			
		||||
UTILSRC=../kiss_fft.c fftutil.c
 | 
			
		||||
 | 
			
		||||
all: $(ALLUTILS)
 | 
			
		||||
 | 
			
		||||
kfft: $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) $(UTILSRC)
 | 
			
		||||
kifft: ../kiss_fft.h ../kiss_fft.c fftutil.c
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DINVERSE_FFT $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. $(UTILSRC)
 | 
			
		||||
kffts: $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DFIXED_POINT $(UTILSRC)
 | 
			
		||||
kiffts: $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -DFIXED_POINT -DINVERSE_FFT $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DFIXED_POINT $(UTILSRC)
 | 
			
		||||
kfftd: $(UTILSRC)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -DNFFT=$(NFFT) -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)
 | 
			
		||||
	gcc -Wall -O3 -o $@ -lm -I.. -Dkiss_fft_scalar=double $(UTILSRC)
 | 
			
		||||
 | 
			
		||||
s2f: typeconvert.c
 | 
			
		||||
	gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=float 
 | 
			
		||||
s2d: typeconvert.c
 | 
			
		||||
	gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=double 
 | 
			
		||||
time: all
 | 
			
		||||
	@echo 
 | 
			
		||||
	@echo "#### timing $(NUMFFTS) x $(NFFT) point FFTs"
 | 
			
		||||
	@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
 | 
			
		||||
	gcc -Wall -O3 -o $@ $^ -DTYPE1=float -DTYPE2=float 
 | 
			
		||||
scales: typeconvert.c
 | 
			
		||||
	gcc -Wall -O3 -o $@ $^ -DTYPE1=short -DTYPE2=short 
 | 
			
		||||
scaled: typeconvert.c
 | 
			
		||||
	gcc -Wall -O3 -o $@ $^ -DTYPE1=double -DTYPE2=double 
 | 
			
		||||
snr: all
 | 
			
		||||
	@which octave
 | 
			
		||||
	@echo
 | 
			
		||||
	@echo "### testing SNR for  $(NFFT) point FFTs"
 | 
			
		||||
	@echo "#### 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
 | 
			
		||||
	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 -
 | 
			
		||||
test: snr time 
 | 
			
		||||
 | 
			
		||||
clean:
 | 
			
		||||
	rm -f $(ALLUTILS) *.dat *~
 | 
			
		||||
 | 
			
		||||
@ -16,6 +16,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 | 
			
		||||
#include <math.h>
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <getopt.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
 | 
			
		||||
#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)
 | 
			
		||||
{
 | 
			
		||||
    kiss_fft_cpx buf[NFFT];
 | 
			
		||||
    void *st;
 | 
			
		||||
    int nfft=1024;
 | 
			
		||||
    int isinverse=0;
 | 
			
		||||
    FILE *fin=stdin;
 | 
			
		||||
    FILE *fout=stdout;
 | 
			
		||||
        
 | 
			
		||||
#ifdef INVERSE_FFT
 | 
			
		||||
    int inverse_fft=1;
 | 
			
		||||
#else    
 | 
			
		||||
    int inverse_fft=0;
 | 
			
		||||
#endif    
 | 
			
		||||
 | 
			
		||||
    st = kiss_fft_alloc( NFFT ,inverse_fft );
 | 
			
		||||
 | 
			
		||||
    while ( fread( buf , sizeof(kiss_fft_cpx) , NFFT , stdin ) > 0 ) {
 | 
			
		||||
        kiss_fft( st , buf );
 | 
			
		||||
        fwrite( buf , sizeof(kiss_fft_cpx) , NFFT , stdout );
 | 
			
		||||
    while (1) {
 | 
			
		||||
        int c=getopt(argc,argv,"n:i");
 | 
			
		||||
        if (c==-1) break;
 | 
			
		||||
        switch (c) {
 | 
			
		||||
            case 'n':nfft = atoi(optarg);break;
 | 
			
		||||
            case 'i':isinverse=1;break;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    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;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user