From 5402d1bce5ee03e441fd314d516d0c0fda30bdfd Mon Sep 17 00:00:00 2001 From: James Almer Date: Fri, 10 Oct 2014 02:18:14 -0300 Subject: [PATCH] float_dsp-test: allow forcing cpuflags Reviewed-by: Michael Niedermayer Signed-off-by: James Almer --- libavutil/float_dsp.c | 35 ++++++++++++++++++++++++++++++----- tests/fate/libavutil.mak | 2 +- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c index 8ac74800ee..78de1a1d3c 100644 --- a/libavutil/float_dsp.c +++ b/libavutil/float_dsp.c @@ -146,6 +146,12 @@ av_cold void avpriv_float_dsp_init(AVFloatDSPContext *fdsp, int bit_exact) #include #include #include +#if HAVE_UNISTD_H +#include /* for getopt */ +#endif +#if !HAVE_GETOPT +#include "compat/getopt.c" +#endif #include "common.h" #include "cpu.h" @@ -369,7 +375,7 @@ static int test_scalarproduct_float(AVFloatDSPContext *fdsp, AVFloatDSPContext * int main(int argc, char **argv) { - int ret = 0; + int ret = 0, seeded = 0; uint32_t seed; AVFloatDSPContext fdsp, cdsp; AVLFG lfg; @@ -380,12 +386,31 @@ int main(int argc, char **argv) LOCAL_ALIGNED(32, double, dbl_src0, [LEN]); LOCAL_ALIGNED(32, double, dbl_src1, [LEN]); - if (argc > 2 && !strcmp(argv[1], "-s")) - seed = strtoul(argv[2], NULL, 10); - else + for (;;) { + int arg = getopt(argc, argv, "s:c:"); + if (arg == -1) + break; + switch (arg) { + case 's': + seed = strtoul(optarg, NULL, 10); + seeded = 1; + break; + case 'c': + { + int cpuflags = av_get_cpu_flags(); + + if (av_parse_cpu_caps(&cpuflags, optarg) < 0) + return 1; + + av_force_cpu_flags(cpuflags); + break; + } + } + } + if (!seeded) seed = av_get_random_seed(); - av_log(NULL, AV_LOG_INFO, "float_dsp-test: random seed %u\n", seed); + av_log(NULL, AV_LOG_INFO, "float_dsp-test: %s %u\n", seeded ? "seed" : "random seed", seed); av_lfg_init(&lfg, seed); diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak index 579bdfb123..4d1a0387aa 100644 --- a/tests/fate/libavutil.mak +++ b/tests/fate/libavutil.mak @@ -53,7 +53,7 @@ fate-fifo: CMD = run libavutil/fifo-test FATE_LIBAVUTIL += fate-float-dsp fate-float-dsp: libavutil/float_dsp-test$(EXESUF) -fate-float-dsp: CMD = run libavutil/float_dsp-test +fate-float-dsp: CMD = run libavutil/float_dsp-test $(CPUFLAGS:%=-c%) fate-float-dsp: CMP = null fate-float-dsp: REF = /dev/null