kfc works

This commit is contained in:
Mark Borgerding 2003-12-29 16:46:27 +00:00
parent cd94cd1ed0
commit 630089ded6
4 changed files with 13 additions and 11 deletions

View File

@ -13,7 +13,7 @@ BENCHKISS=bm_kiss_$(DATATYPE)
BENCHFFTW=bm_fftw_$(DATATYPE) BENCHFFTW=bm_fftw_$(DATATYPE)
SELFTEST=st_$(DATATYPE) SELFTEST=st_$(DATATYPE)
TESTREAL=tr_$(DATATYPE) TESTREAL=tr_$(DATATYPE)
TESTKFC=tc_$(DATATYPE) TESTKFC=tkfc_$(DATATYPE)
FFTUTIL=kf_$(DATATYPE) FFTUTIL=kf_$(DATATYPE)
ifeq "$(DATATYPE)" "short" ifeq "$(DATATYPE)" "short"
@ -44,8 +44,9 @@ $(FFTUTIL): ../kiss_fft.c fftutil.c kiss_fft2d.c kiss_fftr.c
$(SELFTEST): ../kiss_fft.c $(SELFTESTSRC) $(SELFTEST): ../kiss_fft.c $(SELFTESTSRC)
$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+ $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
$(TESTKFC): ../kiss_fft.c kiss_fftr.c test_real.c $(TESTKFC): ../kiss_fft.c kfc.c
$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+ $(CC) -o $@ $(CFLAGS) -I.. -DKFC_TEST $(TYPEFLAGS) -lm $+
$(TESTREAL): ../kiss_fft.c kiss_fftr.c test_real.c $(TESTREAL): ../kiss_fft.c kiss_fftr.c test_real.c
$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+ $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
@ -76,4 +77,4 @@ selftest_short.c:
./mk_test.py -s 10 12 14 > selftest_short.c ./mk_test.py -s 10 12 14 > selftest_short.c
clean: clean:
rm -f *~ bm_* st_* tr_* kf_* rm -f *~ bm_* st_* tr_* kf_* tkfc_*

View File

@ -36,8 +36,8 @@ def main():
usage: compfft.py usage: compfft.py
-n nfft -n nfft
-u utilname : see sample_code/fftutil.c -u utilname : see sample_code/fftutil.c
-R : real-optimized version -R : real-optimized version\n""")
""") sys.exit(1)
x = randbuf(n,cpx) x = randbuf(n,cpx)

View File

@ -13,7 +13,7 @@ BENCHKISS=bm_kiss_$(DATATYPE)
BENCHFFTW=bm_fftw_$(DATATYPE) BENCHFFTW=bm_fftw_$(DATATYPE)
SELFTEST=st_$(DATATYPE) SELFTEST=st_$(DATATYPE)
TESTREAL=tr_$(DATATYPE) TESTREAL=tr_$(DATATYPE)
TESTKFC=tc_$(DATATYPE) TESTKFC=tkfc_$(DATATYPE)
FFTUTIL=kf_$(DATATYPE) FFTUTIL=kf_$(DATATYPE)
ifeq "$(DATATYPE)" "short" ifeq "$(DATATYPE)" "short"
@ -44,8 +44,9 @@ $(FFTUTIL): ../kiss_fft.c fftutil.c kiss_fft2d.c kiss_fftr.c
$(SELFTEST): ../kiss_fft.c $(SELFTESTSRC) $(SELFTEST): ../kiss_fft.c $(SELFTESTSRC)
$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+ $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
$(TESTKFC): ../kiss_fft.c kiss_fftr.c test_real.c $(TESTKFC): ../kiss_fft.c kfc.c
$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+ $(CC) -o $@ $(CFLAGS) -I.. -DKFC_TEST $(TYPEFLAGS) -lm $+
$(TESTREAL): ../kiss_fft.c kiss_fftr.c test_real.c $(TESTREAL): ../kiss_fft.c kiss_fftr.c test_real.c
$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+ $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
@ -76,4 +77,4 @@ selftest_short.c:
./mk_test.py -s 10 12 14 > selftest_short.c ./mk_test.py -s 10 12 14 > selftest_short.c
clean: clean:
rm -f *~ bm_* st_* tr_* kf_* rm -f *~ bm_* st_* tr_* kf_* tkfc_*

View File

@ -4,7 +4,7 @@ typedef struct
{ {
int nfft; int nfft;
int inverse; int inverse;
const void * cfg; void * cfg;
void * next; void * next;
} cached_fft; } cached_fft;