ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Tue Apr 12 15:58:15 2016 +0100| [05e4783c2910e46bd5d3c8dd9d4947ab5081211a] | committer: Derek Buitenhuis
Merge commit 'f6ccee9bed92c09799777c1dfb2b2772763e0e83' * commit 'f6ccee9bed92c09799777c1dfb2b2772763e0e83': fate: fft: Split DCT/FFT/MDCT/RDFT tests into separate targets Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05e4783c2910e46bd5d3c8dd9d4947ab5081211a --- tests/fate/fft.mak | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak index 9fdca2b..244f426 100644 --- a/tests/fate/fft.mak +++ b/tests/fate/fft.mak @@ -1,8 +1,8 @@ define DEF_FFT -FATE_FFT-$(CONFIG_DCT) += fate-dct1d-$(1) fate-idct1d-$(1) -FATE_FFT-$(CONFIG_FFT) += fate-fft-$(1) fate-ifft-$(1) -FATE_FFT-$(CONFIG_MDCT) += fate-mdct-$(1) fate-imdct-$(1) -FATE_FFT-$(CONFIG_RDFT) += fate-rdft-$(1) fate-irdft-$(1) +FATE_DCT-$(CONFIG_DCT) += fate-dct1d-$(1) fate-idct1d-$(1) +FATE_FFT-$(CONFIG_FFT) += fate-fft-$(1) fate-ifft-$(1) +FATE_MDCT-$(CONFIG_MDCT) += fate-mdct-$(1) fate-imdct-$(1) +FATE_RDFT-$(CONFIG_RDFT) += fate-rdft-$(1) fate-irdft-$(1) fate-fft-$(N): ARGS = -n$(1) fate-ifft-$(N): ARGS = -n$(1) -i @@ -16,14 +16,19 @@ endef $(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT,$(N)))) +fate-dct-float: $(FATE_DCT-yes) fate-fft-float: $(FATE_FFT-yes) -$(FATE_FFT-yes): libavcodec/fft-test$(EXESUF) -$(FATE_FFT-yes): CMD = run libavcodec/fft-test $(CPUFLAGS:%=-c%) $(ARGS) -$(FATE_FFT-yes): REF = /dev/null +fate-mdct-float: $(FATE_MDCT-yes) +fate-rdft-float: $(FATE_RDFT-yes) + +FATE_FFT_ALL = $(FATE_DCT-yes) $(FATE_FFT-yes) $(FATE_MDCT-yes) $(FATE_RDFT-yes) + +$(FATE_FFT_ALL): libavcodec/fft-test$(EXESUF) +$(FATE_FFT_ALL): CMD = run libavcodec/fft-test $(CPUFLAGS:%=-c%) $(ARGS) define DEF_FFT_FIXED -FATE_FFT_FIXED-$(CONFIG_FFT) += fate-fft-fixed-$(1) fate-ifft-fixed-$(1) -FATE_FFT_FIXED-$(CONFIG_MDCT) += fate-mdct-fixed-$(1) fate-imdct-fixed-$(1) +FATE_FFT_FIXED-$(CONFIG_FFT) += fate-fft-fixed-$(1) fate-ifft-fixed-$(1) +FATE_MDCT_FIXED-$(CONFIG_MDCT) += fate-mdct-fixed-$(1) fate-imdct-fixed-$(1) fate-fft-fixed-$(1): ARGS = -n$(1) fate-ifft-fixed-$(1): ARGS = -n$(1) -i @@ -34,9 +39,14 @@ endef $(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT_FIXED,$(N)))) fate-fft-fixed: $(FATE_FFT_FIXED-yes) -$(FATE_FFT_FIXED-yes): libavcodec/fft-fixed-test$(EXESUF) -$(FATE_FFT_FIXED-yes): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS) -$(FATE_FFT_FIXED-yes): REF = /dev/null +fate-mdct-fixed: $(FATE_MDCT_FIXED-yes) + +FATE_FFT_FIXED_ALL = $(FATE_FFT_FIXED-yes) $(FATE_MDCT_FIXED-yes) + +$(FATE_FFT_FIXED_ALL): libavcodec/fft-fixed-test$(EXESUF) +$(FATE_FFT_FIXED_ALL): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS) + +$(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL): REF = /dev/null define DEF_FFT_FIXED32 FATE_FFT_FIXED32 += fate-fft-fixed32-$(1) fate-ifft-fixed32-$(1) \ @@ -55,5 +65,10 @@ $(FATE_FFT_FIXED32): libavcodec/fft-fixed32-test$(EXESUF) $(FATE_FFT_FIXED32): CMD = run libavcodec/fft-fixed32-test $(CPUFLAGS:%=-c%) $(ARGS) $(FATE_FFT_FIXED32): REF = /dev/null -FATE-$(call ALLYES, AVCODEC FFT MDCT) += $(FATE_FFT-yes) $(FATE_FFT_FIXED-yes) $(FATE_FFT_FIXED32) -fate-fft: $(FATE_FFT-yes) $(FATE_FFT_FIXED-yes) $(FATE_FFT_FIXED32) +fate-dct: fate-dct-float +fate-fft: fate-fft-float fate-fft-fixed fate-fft-fixed32-test +fate-mdct: fate-mdct-float fate-mdct-fixed +fate-rdft: fate-rdft-float + +FATE-$(call ALLYES, AVCODEC FFT MDCT) += $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) $(FATE_FFT_FIXED32) +fate-fft-all: $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) $(FATE_FFT_FIXED32) ====================================================================== diff --cc tests/fate/fft.mak index 9fdca2b,6349e5a..244f426 --- a/tests/fate/fft.mak +++ b/tests/fate/fft.mak @@@ -34,26 -39,19 +39,36 @@@ ende $(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT_FIXED,$(N)))) fate-fft-fixed: $(FATE_FFT_FIXED-yes) - $(FATE_FFT_FIXED-yes): libavcodec/fft-fixed-test$(EXESUF) - $(FATE_FFT_FIXED-yes): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS) - $(FATE_FFT_FIXED-yes): REF = /dev/null + fate-mdct-fixed: $(FATE_MDCT_FIXED-yes) + + FATE_FFT_FIXED_ALL = $(FATE_FFT_FIXED-yes) $(FATE_MDCT_FIXED-yes) + + $(FATE_FFT_FIXED_ALL): libavcodec/fft-fixed-test$(EXESUF) + $(FATE_FFT_FIXED_ALL): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS) + + $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL): REF = /dev/null +define DEF_FFT_FIXED32 +FATE_FFT_FIXED32 += fate-fft-fixed32-$(1) fate-ifft-fixed32-$(1) \ + fate-mdct-fixed32-$(1) fate-imdct-fixed32-$(1) + +fate-fft-fixed32-$(1): ARGS = -n$(1) +fate-ifft-fixed32-$(1): ARGS = -n$(1) -i +#fate-mdct-fixed32-$(1): ARGS = -n$(1) -m +fate-imdct-fixed32-$(1): ARGS = -n$(1) -m -i +endef + +$(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT_FIXED32,$(N)))) + +fate-fft-fixed32-test: $(FATE_FFT_FIXED32) +$(FATE_FFT_FIXED32): libavcodec/fft-fixed32-test$(EXESUF) +$(FATE_FFT_FIXED32): CMD = run libavcodec/fft-fixed32-test $(CPUFLAGS:%=-c%) $(ARGS) +$(FATE_FFT_FIXED32): REF = /dev/null + - FATE-$(call ALLYES, AVCODEC FFT MDCT) += $(FATE_FFT-yes) $(FATE_FFT_FIXED-yes) $(FATE_FFT_FIXED32) - fate-fft: $(FATE_FFT-yes) $(FATE_FFT_FIXED-yes) $(FATE_FFT_FIXED32) + fate-dct: fate-dct-float -fate-fft: fate-fft-float fate-fft-fixed ++fate-fft: fate-fft-float fate-fft-fixed fate-fft-fixed32-test + fate-mdct: fate-mdct-float fate-mdct-fixed + fate-rdft: fate-rdft-float + -FATE-$(CONFIG_AVCODEC) += $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) -fate-fft-all: $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) ++FATE-$(call ALLYES, AVCODEC FFT MDCT) += $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) $(FATE_FFT_FIXED32) ++fate-fft-all: $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) $(FATE_FFT_FIXED32) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
