mirror of
https://github.com/mborgerding/kissfft.git
synced 2025-07-17 20:44:21 -04:00
made the factorization a separate routine
This commit is contained in:
@ -9,9 +9,10 @@ ifeq "$(DATATYPE)" ""
|
||||
endif
|
||||
|
||||
UTIL=fftutil_$(DATATYPE)
|
||||
BENCH=bm_$(DATATYPE)
|
||||
BENCHKISS=bm_kiss_$(DATATYPE)
|
||||
BENCHFFTW=bm_fftw_$(DATATYPE)
|
||||
|
||||
all: $(UTIL) $(BENCH)
|
||||
all: $(UTIL) $(BENCHKISS)
|
||||
|
||||
ifeq "$(DATATYPE)" "short"
|
||||
TYPEFLAGS=-DFIXED_POINT -Dkiss_fft_scalar=short
|
||||
@ -23,40 +24,34 @@ CFLAGS=-Wall -O3 -ansi -pedantic
|
||||
$(UTIL): ../kiss_fft.c fftutil.c
|
||||
gcc -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) ../kiss_fft.c fftutil.c -lm
|
||||
|
||||
$(BENCH): benchkiss.c ../kiss_fft.c pstats.c
|
||||
$(BENCHKISS): benchkiss.c ../kiss_fft.c pstats.c
|
||||
gcc -o $@ $(CFLAGS) -I.. benchkiss.c $(TYPEFLAGS) ../kiss_fft.c pstats.c -lm
|
||||
|
||||
fftw: bm_fftw
|
||||
@[ -x ./bm_fftw ] && \
|
||||
./bm_fftw -x $(NUMFFTS) -n $(NFFT)
|
||||
fftw: $(BENCHFFTW)
|
||||
./$(BENCHFFTW) -x $(NUMFFTS) -n $(NFFT)
|
||||
|
||||
bm_fftw: benchfftw.c pstats.c
|
||||
@gcc -o $@ $(CFLAGS) benchfftw.c pstats.c -lm -lfftw3 -L /usr/local/lib/ \
|
||||
|| echo 'Cannot build FFTW test script'
|
||||
$(BENCHFFTW): benchfftw.c pstats.c
|
||||
gcc -o $@ $(CFLAGS) -DDATATYPE$(DATATYPE) benchfftw.c pstats.c -lm -lfftw3f -lfftw3 -L /usr/local/lib/
|
||||
|
||||
time: all
|
||||
@./$(BENCH) -x $(NUMFFTS) -n $(NFFT)
|
||||
@./$(BENCHKISS) -x $(NUMFFTS) -n $(NFFT)
|
||||
|
||||
POW2=256 512 1024 2048
|
||||
POW2=256 512 1024 2048 4096 8192
|
||||
POW3=243 729 2187
|
||||
POW5=25 125 625 3125
|
||||
|
||||
mtime: all bm_fftw
|
||||
for n in $(POW3) ;do \
|
||||
./$(BENCH) -x $(NUMFFTS) -n $$n;\
|
||||
[ "$(DATATYPE)" == "double" ] && [ -x ./bm_fftw ] && ./bm_fftw -x $(NUMFFTS) -n $$n || true ; \
|
||||
mtime: all $(BENCHFFTW)
|
||||
for n in $(POW2) $(POW3) $(POW5) ;do \
|
||||
echo ============================;\
|
||||
./$(BENCHKISS) -x $(NUMFFTS) -n $$n;\
|
||||
[ -x ./$(BENCHFFTW) ] && ./$(BENCHFFTW) -x $(NUMFFTS) -n $$n || true ; \
|
||||
done
|
||||
|
||||
snr: all
|
||||
@echo "### testing SNR for $(NFFT) point $(DATATYPE) FFTs"
|
||||
@echo "testkiss( $(NFFT) , '$(DATATYPE)' );" | octave -q
|
||||
|
||||
|
||||
ifeq "$(DATATYPE)" "double"
|
||||
test: snr time fftw
|
||||
else
|
||||
test: snr time
|
||||
endif
|
||||
|
||||
clean:
|
||||
rm -f *~ fftutil_* bm_*
|
||||
rm -f *~ fftutil_* bm_* *.dat
|
||||
|
@ -4,15 +4,44 @@
|
||||
#include <getopt.h>
|
||||
#include "pstats.h"
|
||||
|
||||
#ifdef DATATYPEdouble
|
||||
|
||||
#define CPXTYPE fftw_complex
|
||||
#define PLAN fftw_plan
|
||||
#define FFTMALLOC fftw_malloc
|
||||
#define MAKEPLAN fftw_plan_dft_1d
|
||||
#define DOFFT fftw_execute
|
||||
#define DESTROYPLAN fftw_destroy_plan
|
||||
#define FFTFREE fftw_free
|
||||
|
||||
#elif defined(DATATYPEfloat)
|
||||
|
||||
#define CPXTYPE fftwf_complex
|
||||
#define PLAN fftwf_plan
|
||||
#define FFTMALLOC fftwf_malloc
|
||||
#define MAKEPLAN fftwf_plan_dft_1d
|
||||
#define DOFFT fftwf_execute
|
||||
#define DESTROYPLAN fftwf_destroy_plan
|
||||
#define FFTFREE fftwf_free
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef CPXTYPE
|
||||
int main()
|
||||
{
|
||||
fprintf(stderr,"Datatype not available in FFTW\n" );
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
int main(int argc,char ** argv)
|
||||
{
|
||||
int nfft=1024;
|
||||
int isinverse=0;
|
||||
int numffts=1000,i;
|
||||
|
||||
fftw_complex * in=NULL;
|
||||
fftw_complex * out=NULL;
|
||||
fftw_plan p;
|
||||
CPXTYPE * in=NULL;
|
||||
CPXTYPE * out=NULL;
|
||||
PLAN p;
|
||||
|
||||
pstats_init();
|
||||
|
||||
@ -33,28 +62,28 @@ int main(int argc,char ** argv)
|
||||
}
|
||||
}
|
||||
|
||||
in=fftw_malloc(sizeof(fftw_complex) * nfft);
|
||||
out=fftw_malloc(sizeof(fftw_complex) * nfft);
|
||||
in=FFTMALLOC(sizeof(CPXTYPE) * nfft);
|
||||
out=FFTMALLOC(sizeof(CPXTYPE) * nfft);
|
||||
for (i=0;i<nfft;++i ) {
|
||||
in[i][0] = rand() - RAND_MAX/2;
|
||||
in[i][1] = rand() - RAND_MAX/2;
|
||||
}
|
||||
|
||||
if ( isinverse )
|
||||
p = fftw_plan_dft_1d(nfft, in, out, FFTW_BACKWARD, FFTW_ESTIMATE);
|
||||
p = MAKEPLAN(nfft, in, out, FFTW_BACKWARD, FFTW_ESTIMATE);
|
||||
else
|
||||
p = fftw_plan_dft_1d(nfft, in, out, FFTW_FORWARD, FFTW_ESTIMATE);
|
||||
p = MAKEPLAN(nfft, in, out, FFTW_FORWARD, FFTW_ESTIMATE);
|
||||
|
||||
for (i=0;i<numffts;++i)
|
||||
fftw_execute(p);
|
||||
DOFFT(p);
|
||||
|
||||
fftw_destroy_plan(p);
|
||||
DESTROYPLAN(p);
|
||||
|
||||
fftw_free(in); fftw_free(out);
|
||||
FFTFREE(in); FFTFREE(out);
|
||||
|
||||
fprintf(stderr,"fftw\tnfft=%d\tnumffts=%d\n", nfft,numffts);
|
||||
pstats_report();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -36,6 +36,5 @@ void pstats_report()
|
||||
{
|
||||
ps_report();
|
||||
tms_report();
|
||||
fprintf(stderr,"\n");
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user