| Message ID | 20240518184410.60089-1-remi@remlab.net |
|---|---|
| State | Accepted |
| Commit | 44f7f6e010d48aae7e3eb5442d363e622f7bd35a |
| Headers | show |
| Series | [FFmpeg-devel] checkasm: add h263dsp.{h,v}_loop_filter | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Le lauantaina 18. toukokuuta 2024, 21.44.10 EEST Rémi Denis-Courmont a écrit : > --- > tests/checkasm/Makefile | 1 + > tests/checkasm/checkasm.c | 3 ++ > tests/checkasm/checkasm.h | 1 + > tests/checkasm/h263dsp.c | 62 +++++++++++++++++++++++++++++++++++++++ > tests/fate/checkasm.mak | 1 + > 5 files changed, 68 insertions(+) > create mode 100644 tests/checkasm/h263dsp.c > > diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile > index 92624aab0a..1dc770e9da 100644 > --- a/tests/checkasm/Makefile > +++ b/tests/checkasm/Makefile > @@ -7,6 +7,7 @@ AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o > AVCODECOBJS-$(CONFIG_FDCTDSP) += fdctdsp.o > AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o > AVCODECOBJS-$(CONFIG_G722DSP) += g722dsp.o > +AVCODECOBJS-$(CONFIG_H263DSP) += h263dsp.o > AVCODECOBJS-$(CONFIG_H264CHROMA) += h264chroma.o > AVCODECOBJS-$(CONFIG_H264DSP) += h264dsp.o > AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o > diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c > index 31ca9f6e2b..92c9e44df7 100644 > --- a/tests/checkasm/checkasm.c > +++ b/tests/checkasm/checkasm.c > @@ -118,6 +118,9 @@ static const struct { > #if CONFIG_G722DSP > { "g722dsp", checkasm_check_g722dsp }, > #endif > + #if CONFIG_H263DSP > + { "h263dsp", checkasm_check_h263dsp }, > + #endif > #if CONFIG_H264CHROMA > { "h264chroma", checkasm_check_h264chroma }, > #endif > diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h > index 07fcc751ff..334fb79734 100644 > --- a/tests/checkasm/checkasm.h > +++ b/tests/checkasm/checkasm.h > @@ -91,6 +91,7 @@ void checkasm_check_flacdsp(void); > void checkasm_check_float_dsp(void); > void checkasm_check_fmtconvert(void); > void checkasm_check_g722dsp(void); > +void checkasm_check_h263dsp(void); > void checkasm_check_h264chroma(void); > void checkasm_check_h264dsp(void); > void checkasm_check_h264pred(void); > diff --git a/tests/checkasm/h263dsp.c b/tests/checkasm/h263dsp.c > new file mode 100644 > index 0000000000..2d0957a90b > --- /dev/null > +++ b/tests/checkasm/h263dsp.c > @@ -0,0 +1,62 @@ > +/* > + * Copyright (c) 2024 Rémi Denis-Courmont > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License along > + * with FFmpeg; if not, write to the Free Software Foundation, Inc., > + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + */ > + > +#include <string.h> > + > +#include "checkasm.h" > + > +#include "libavcodec/h263dsp.h" > +#include "libavutil/mem.h" > +#include "libavutil/mem_internal.h" > + > +typedef void (*filter)(uint8_t *src, int stride, int qscale); > + > +static void check_loop_filter(char dim, filter func) > +{ > + LOCAL_ALIGNED_16(uint8_t, buf0, [32 * 32]); > + LOCAL_ALIGNED_16(uint8_t, buf1, [32 * 32]); > + int qscale = rnd() % 32; > + > + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *, int, int); > + > + for (size_t y = 0; y < 32; y++) > + for (size_t x = 0; x < 32; x++) > + buf0[y * 32 + x] = buf1[y * 32 + x] = rnd(); This has only a low chance of triggering the interesting cases, but then again some test is better than no test. Except for objections, I'll merge as is. > + > + if (check_func(func, "h263dsp.%c_loop_filter", dim)) { > + call_ref(buf0 + 8 * 33, 32, qscale); > + call_new(buf1 + 8 * 33, 32, qscale); > + > + if (memcmp(buf0, buf1, 32 * 32)) > + fail(); > + > + bench_new(buf1 + 8 * 33, 32, 1); > + } > +} > + > +void checkasm_check_h263dsp(void) > +{ > + H263DSPContext ctx; > + > + ff_h263dsp_init(&ctx); > + check_loop_filter('h', ctx.h263_h_loop_filter); > + check_loop_filter('v', ctx.h263_v_loop_filter); > + report("loop_filter"); > +} > diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak > index d021e124d1..8d2705165a 100644 > --- a/tests/fate/checkasm.mak > +++ b/tests/fate/checkasm.mak > @@ -14,6 +14,7 @@ FATE_CHECKASM = fate-checkasm-aacencdsp > \ fate-checkasm-float_dsp \ > fate-checkasm-fmtconvert \ > fate-checkasm-g722dsp \ + > fate-checkasm-h263dsp \ > fate-checkasm-h264chroma \ > fate-checkasm-h264dsp \ > fate-checkasm-h264pred \
On 5/18/2024 3:44 PM, Rémi Denis-Courmont wrote: > --- > tests/checkasm/Makefile | 1 + > tests/checkasm/checkasm.c | 3 ++ > tests/checkasm/checkasm.h | 1 + > tests/checkasm/h263dsp.c | 62 +++++++++++++++++++++++++++++++++++++++ > tests/fate/checkasm.mak | 1 + > 5 files changed, 68 insertions(+) > create mode 100644 tests/checkasm/h263dsp.c > > diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile > index 92624aab0a..1dc770e9da 100644 > --- a/tests/checkasm/Makefile > +++ b/tests/checkasm/Makefile > @@ -7,6 +7,7 @@ AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o > AVCODECOBJS-$(CONFIG_FDCTDSP) += fdctdsp.o > AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o > AVCODECOBJS-$(CONFIG_G722DSP) += g722dsp.o > +AVCODECOBJS-$(CONFIG_H263DSP) += h263dsp.o > AVCODECOBJS-$(CONFIG_H264CHROMA) += h264chroma.o > AVCODECOBJS-$(CONFIG_H264DSP) += h264dsp.o > AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o > diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c > index 31ca9f6e2b..92c9e44df7 100644 > --- a/tests/checkasm/checkasm.c > +++ b/tests/checkasm/checkasm.c > @@ -118,6 +118,9 @@ static const struct { > #if CONFIG_G722DSP > { "g722dsp", checkasm_check_g722dsp }, > #endif > + #if CONFIG_H263DSP > + { "h263dsp", checkasm_check_h263dsp }, > + #endif > #if CONFIG_H264CHROMA > { "h264chroma", checkasm_check_h264chroma }, > #endif > diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h > index 07fcc751ff..334fb79734 100644 > --- a/tests/checkasm/checkasm.h > +++ b/tests/checkasm/checkasm.h > @@ -91,6 +91,7 @@ void checkasm_check_flacdsp(void); > void checkasm_check_float_dsp(void); > void checkasm_check_fmtconvert(void); > void checkasm_check_g722dsp(void); > +void checkasm_check_h263dsp(void); > void checkasm_check_h264chroma(void); > void checkasm_check_h264dsp(void); > void checkasm_check_h264pred(void); > diff --git a/tests/checkasm/h263dsp.c b/tests/checkasm/h263dsp.c > new file mode 100644 > index 0000000000..2d0957a90b > --- /dev/null > +++ b/tests/checkasm/h263dsp.c > @@ -0,0 +1,62 @@ > +/* > + * Copyright (c) 2024 Rémi Denis-Courmont > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License along > + * with FFmpeg; if not, write to the Free Software Foundation, Inc., > + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + */ > + > +#include <string.h> > + > +#include "checkasm.h" > + > +#include "libavcodec/h263dsp.h" > +#include "libavutil/mem.h" > +#include "libavutil/mem_internal.h" > + > +typedef void (*filter)(uint8_t *src, int stride, int qscale); > + > +static void check_loop_filter(char dim, filter func) > +{ > + LOCAL_ALIGNED_16(uint8_t, buf0, [32 * 32]); > + LOCAL_ALIGNED_16(uint8_t, buf1, [32 * 32]); > + int qscale = rnd() % 32; > + > + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *, int, int); > + > + for (size_t y = 0; y < 32; y++) > + for (size_t x = 0; x < 32; x++) > + buf0[y * 32 + x] = buf1[y * 32 + x] = rnd(); for (size_t i = 0; i < 32 * 32; i += 4) { uint32_t r = rnd(); AV_WN32A(buf0 + i, r); AV_WN32A(buf1 + i, r); } > + > + if (check_func(func, "h263dsp.%c_loop_filter", dim)) { > + call_ref(buf0 + 8 * 33, 32, qscale); > + call_new(buf1 + 8 * 33, 32, qscale); > + > + if (memcmp(buf0, buf1, 32 * 32)) > + fail(); > + > + bench_new(buf1 + 8 * 33, 32, 1); > + } > +} > + > +void checkasm_check_h263dsp(void) > +{ > + H263DSPContext ctx; > + > + ff_h263dsp_init(&ctx); > + check_loop_filter('h', ctx.h263_h_loop_filter); > + check_loop_filter('v', ctx.h263_v_loop_filter); > + report("loop_filter"); > +} > diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak > index d021e124d1..8d2705165a 100644 > --- a/tests/fate/checkasm.mak > +++ b/tests/fate/checkasm.mak > @@ -14,6 +14,7 @@ FATE_CHECKASM = fate-checkasm-aacencdsp \ > fate-checkasm-float_dsp \ > fate-checkasm-fmtconvert \ > fate-checkasm-g722dsp \ > + fate-checkasm-h263dsp \ > fate-checkasm-h264chroma \ > fate-checkasm-h264dsp \ > fate-checkasm-h264pred \
Le lauantaina 25. toukokuuta 2024, 19.30.44 EEST James Almer a écrit : > On 5/18/2024 3:44 PM, Rémi Denis-Courmont wrote: > > --- > > > > tests/checkasm/Makefile | 1 + > > tests/checkasm/checkasm.c | 3 ++ > > tests/checkasm/checkasm.h | 1 + > > tests/checkasm/h263dsp.c | 62 +++++++++++++++++++++++++++++++++++++++ > > tests/fate/checkasm.mak | 1 + > > 5 files changed, 68 insertions(+) > > create mode 100644 tests/checkasm/h263dsp.c > > > > diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile > > index 92624aab0a..1dc770e9da 100644 > > --- a/tests/checkasm/Makefile > > +++ b/tests/checkasm/Makefile > > @@ -7,6 +7,7 @@ AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o > > > > AVCODECOBJS-$(CONFIG_FDCTDSP) += fdctdsp.o > > AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o > > AVCODECOBJS-$(CONFIG_G722DSP) += g722dsp.o > > > > +AVCODECOBJS-$(CONFIG_H263DSP) += h263dsp.o > > > > AVCODECOBJS-$(CONFIG_H264CHROMA) += h264chroma.o > > AVCODECOBJS-$(CONFIG_H264DSP) += h264dsp.o > > AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o > > > > diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c > > index 31ca9f6e2b..92c9e44df7 100644 > > --- a/tests/checkasm/checkasm.c > > +++ b/tests/checkasm/checkasm.c > > @@ -118,6 +118,9 @@ static const struct { > > > > #if CONFIG_G722DSP > > > > { "g722dsp", checkasm_check_g722dsp }, > > > > #endif > > > > + #if CONFIG_H263DSP > > + { "h263dsp", checkasm_check_h263dsp }, > > + #endif > > > > #if CONFIG_H264CHROMA > > > > { "h264chroma", checkasm_check_h264chroma }, > > > > #endif > > > > diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h > > index 07fcc751ff..334fb79734 100644 > > --- a/tests/checkasm/checkasm.h > > +++ b/tests/checkasm/checkasm.h > > @@ -91,6 +91,7 @@ void checkasm_check_flacdsp(void); > > > > void checkasm_check_float_dsp(void); > > void checkasm_check_fmtconvert(void); > > void checkasm_check_g722dsp(void); > > > > +void checkasm_check_h263dsp(void); > > > > void checkasm_check_h264chroma(void); > > void checkasm_check_h264dsp(void); > > void checkasm_check_h264pred(void); > > > > diff --git a/tests/checkasm/h263dsp.c b/tests/checkasm/h263dsp.c > > new file mode 100644 > > index 0000000000..2d0957a90b > > --- /dev/null > > +++ b/tests/checkasm/h263dsp.c > > @@ -0,0 +1,62 @@ > > +/* > > + * Copyright (c) 2024 Rémi Denis-Courmont > > + * > > + * This file is part of FFmpeg. > > + * > > + * FFmpeg is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License as published by > > + * the Free Software Foundation; either version 2 of the License, or > > + * (at your option) any later version. > > + * > > + * FFmpeg is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + * > > + * You should have received a copy of the GNU General Public License > > along > > + * with FFmpeg; if not, write to the Free Software Foundation, Inc., > > + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > > + */ > > + > > +#include <string.h> > > + > > +#include "checkasm.h" > > + > > +#include "libavcodec/h263dsp.h" > > +#include "libavutil/mem.h" > > +#include "libavutil/mem_internal.h" > > + > > +typedef void (*filter)(uint8_t *src, int stride, int qscale); > > + > > +static void check_loop_filter(char dim, filter func) > > +{ > > + LOCAL_ALIGNED_16(uint8_t, buf0, [32 * 32]); > > + LOCAL_ALIGNED_16(uint8_t, buf1, [32 * 32]); > > + int qscale = rnd() % 32; > > + > > + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *, int, int); > > + > > + for (size_t y = 0; y < 32; y++) > > + for (size_t x = 0; x < 32; x++) > > + buf0[y * 32 + x] = buf1[y * 32 + x] = rnd(); > > for (size_t i = 0; i < 32 * 32; i += 4) { > uint32_t r = rnd(); > AV_WN32A(buf0 + i, r); > AV_WN32A(buf1 + i, r); > } I can do it but is this really a good idea? Optimising test cases feels kinda vain to me. But more importantly, a better and less random test would presumably need to deal with invididual sample values, so this is actually adding one more hurdle to improving the code later. Not that I'd know any volunteer to do that.
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 92624aab0a..1dc770e9da 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -7,6 +7,7 @@ AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o AVCODECOBJS-$(CONFIG_FDCTDSP) += fdctdsp.o AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o AVCODECOBJS-$(CONFIG_G722DSP) += g722dsp.o +AVCODECOBJS-$(CONFIG_H263DSP) += h263dsp.o AVCODECOBJS-$(CONFIG_H264CHROMA) += h264chroma.o AVCODECOBJS-$(CONFIG_H264DSP) += h264dsp.o AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index 31ca9f6e2b..92c9e44df7 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -118,6 +118,9 @@ static const struct { #if CONFIG_G722DSP { "g722dsp", checkasm_check_g722dsp }, #endif + #if CONFIG_H263DSP + { "h263dsp", checkasm_check_h263dsp }, + #endif #if CONFIG_H264CHROMA { "h264chroma", checkasm_check_h264chroma }, #endif diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 07fcc751ff..334fb79734 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -91,6 +91,7 @@ void checkasm_check_flacdsp(void); void checkasm_check_float_dsp(void); void checkasm_check_fmtconvert(void); void checkasm_check_g722dsp(void); +void checkasm_check_h263dsp(void); void checkasm_check_h264chroma(void); void checkasm_check_h264dsp(void); void checkasm_check_h264pred(void); diff --git a/tests/checkasm/h263dsp.c b/tests/checkasm/h263dsp.c new file mode 100644 index 0000000000..2d0957a90b --- /dev/null +++ b/tests/checkasm/h263dsp.c @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2024 Rémi Denis-Courmont + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <string.h> + +#include "checkasm.h" + +#include "libavcodec/h263dsp.h" +#include "libavutil/mem.h" +#include "libavutil/mem_internal.h" + +typedef void (*filter)(uint8_t *src, int stride, int qscale); + +static void check_loop_filter(char dim, filter func) +{ + LOCAL_ALIGNED_16(uint8_t, buf0, [32 * 32]); + LOCAL_ALIGNED_16(uint8_t, buf1, [32 * 32]); + int qscale = rnd() % 32; + + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *, int, int); + + for (size_t y = 0; y < 32; y++) + for (size_t x = 0; x < 32; x++) + buf0[y * 32 + x] = buf1[y * 32 + x] = rnd(); + + if (check_func(func, "h263dsp.%c_loop_filter", dim)) { + call_ref(buf0 + 8 * 33, 32, qscale); + call_new(buf1 + 8 * 33, 32, qscale); + + if (memcmp(buf0, buf1, 32 * 32)) + fail(); + + bench_new(buf1 + 8 * 33, 32, 1); + } +} + +void checkasm_check_h263dsp(void) +{ + H263DSPContext ctx; + + ff_h263dsp_init(&ctx); + check_loop_filter('h', ctx.h263_h_loop_filter); + check_loop_filter('v', ctx.h263_v_loop_filter); + report("loop_filter"); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index d021e124d1..8d2705165a 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -14,6 +14,7 @@ FATE_CHECKASM = fate-checkasm-aacencdsp \ fate-checkasm-float_dsp \ fate-checkasm-fmtconvert \ fate-checkasm-g722dsp \ + fate-checkasm-h263dsp \ fate-checkasm-h264chroma \ fate-checkasm-h264dsp \ fate-checkasm-h264pred \