| Message ID | 20240605200803.2999-1-jamrial@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] checkasm/sw_rgb: test rgb32/rgb32_1 to yuv | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
James Almer: > Test all four pixel formats, but only bench the two native endian ones for a > given target. > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > tests/checkasm/sw_rgb.c | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c > index b51d0836c3..cba6b87add 100644 > --- a/tests/checkasm/sw_rgb.c > +++ b/tests/checkasm/sw_rgb.c > @@ -187,11 +187,15 @@ static const int input_sizes[] = {8, 128, 1080, MAX_LINE_SIZE}; > static const enum AVPixelFormat rgb_formats[] = { > AV_PIX_FMT_RGB24, > AV_PIX_FMT_BGR24, > + AV_PIX_FMT_RGBA, > + AV_PIX_FMT_BGRA, > + AV_PIX_FMT_ABGR, > + AV_PIX_FMT_ARGB, > }; > > static void check_rgb_to_y(struct SwsContext *ctx) > { > - LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]); > + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 4]); > LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]); > LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]); > > @@ -199,7 +203,7 @@ static void check_rgb_to_y(struct SwsContext *ctx) > const uint8_t *unused1, const uint8_t *unused2, int width, > uint32_t *rgb2yuv, void *opq); > > - randomize_buffers(src, MAX_LINE_SIZE * 3); > + randomize_buffers(src, MAX_LINE_SIZE * 4); > > for (int i = 0; i < FF_ARRAY_ELEMS(rgb_formats); i++) { > const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(rgb_formats[i]); > @@ -220,7 +224,10 @@ static void check_rgb_to_y(struct SwsContext *ctx) > if (memcmp(dst0_y, dst1_y, w * 2)) > fail(); > > - bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL); > + if (desc->nb_components == 3 || > + // only bench native endian formats > + (ctx->srcFormat == AV_PIX_FMT_RGB32 || ctx->srcFormat == AV_PIX_FMT_RGB32_1)) > + bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL); > } > } > } > @@ -228,7 +235,7 @@ static void check_rgb_to_y(struct SwsContext *ctx) > > static void check_rgb_to_uv(struct SwsContext *ctx) > { > - LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]); > + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 4]); Doesn't this make the test less strict wrt overreading for tests that are only supposed to use MAX_LINE_SIZE * 3? > LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]); > LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]); > LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]); > @@ -238,7 +245,7 @@ static void check_rgb_to_uv(struct SwsContext *ctx) > const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, > int width, uint32_t *pal, void *opq); > > - randomize_buffers(src, MAX_LINE_SIZE * 3); > + randomize_buffers(src, MAX_LINE_SIZE * 4); > > for (int i = 0; i < 2 * FF_ARRAY_ELEMS(rgb_formats); i++) { > enum AVPixelFormat src_fmt = rgb_formats[i / 2]; > @@ -266,7 +273,10 @@ static void check_rgb_to_uv(struct SwsContext *ctx) > if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, dst1_v, w * 2)) > fail(); > > - bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL); > + if (desc->nb_components == 3 || > + // only bench native endian formats > + (ctx->srcFormat == AV_PIX_FMT_RGB32 || ctx->srcFormat == AV_PIX_FMT_RGB32_1)) > + bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL); > } > } > }
On 6/5/2024 5:10 PM, Andreas Rheinhardt wrote: > James Almer: >> Test all four pixel formats, but only bench the two native endian ones for a >> given target. >> >> Signed-off-by: James Almer <jamrial@gmail.com> >> --- >> tests/checkasm/sw_rgb.c | 22 ++++++++++++++++------ >> 1 file changed, 16 insertions(+), 6 deletions(-) >> >> diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c >> index b51d0836c3..cba6b87add 100644 >> --- a/tests/checkasm/sw_rgb.c >> +++ b/tests/checkasm/sw_rgb.c >> @@ -187,11 +187,15 @@ static const int input_sizes[] = {8, 128, 1080, MAX_LINE_SIZE}; >> static const enum AVPixelFormat rgb_formats[] = { >> AV_PIX_FMT_RGB24, >> AV_PIX_FMT_BGR24, >> + AV_PIX_FMT_RGBA, >> + AV_PIX_FMT_BGRA, >> + AV_PIX_FMT_ABGR, >> + AV_PIX_FMT_ARGB, >> }; >> >> static void check_rgb_to_y(struct SwsContext *ctx) >> { >> - LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]); >> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 4]); >> LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]); >> LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]); >> >> @@ -199,7 +203,7 @@ static void check_rgb_to_y(struct SwsContext *ctx) >> const uint8_t *unused1, const uint8_t *unused2, int width, >> uint32_t *rgb2yuv, void *opq); >> >> - randomize_buffers(src, MAX_LINE_SIZE * 3); >> + randomize_buffers(src, MAX_LINE_SIZE * 4); >> >> for (int i = 0; i < FF_ARRAY_ELEMS(rgb_formats); i++) { >> const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(rgb_formats[i]); >> @@ -220,7 +224,10 @@ static void check_rgb_to_y(struct SwsContext *ctx) >> if (memcmp(dst0_y, dst1_y, w * 2)) >> fail(); >> >> - bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL); >> + if (desc->nb_components == 3 || >> + // only bench native endian formats >> + (ctx->srcFormat == AV_PIX_FMT_RGB32 || ctx->srcFormat == AV_PIX_FMT_RGB32_1)) >> + bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL); >> } >> } >> } >> @@ -228,7 +235,7 @@ static void check_rgb_to_y(struct SwsContext *ctx) >> >> static void check_rgb_to_uv(struct SwsContext *ctx) >> { >> - LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]); >> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 4]); > > Doesn't this make the test less strict wrt overreading for tests that > are only supposed to use MAX_LINE_SIZE * 3? Probably. Want me to add a second src buffer for this? > >> LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]); >> LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]); >> LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]); >> @@ -238,7 +245,7 @@ static void check_rgb_to_uv(struct SwsContext *ctx) >> const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, >> int width, uint32_t *pal, void *opq); >> >> - randomize_buffers(src, MAX_LINE_SIZE * 3); >> + randomize_buffers(src, MAX_LINE_SIZE * 4); >> >> for (int i = 0; i < 2 * FF_ARRAY_ELEMS(rgb_formats); i++) { >> enum AVPixelFormat src_fmt = rgb_formats[i / 2]; >> @@ -266,7 +273,10 @@ static void check_rgb_to_uv(struct SwsContext *ctx) >> if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, dst1_v, w * 2)) >> fail(); >> >> - bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL); >> + if (desc->nb_components == 3 || >> + // only bench native endian formats >> + (ctx->srcFormat == AV_PIX_FMT_RGB32 || ctx->srcFormat == AV_PIX_FMT_RGB32_1)) >> + bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL); >> } >> } >> } > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
James Almer: > On 6/5/2024 5:10 PM, Andreas Rheinhardt wrote: >> James Almer: >>> Test all four pixel formats, but only bench the two native endian >>> ones for a >>> given target. >>> >>> Signed-off-by: James Almer <jamrial@gmail.com> >>> --- >>> tests/checkasm/sw_rgb.c | 22 ++++++++++++++++------ >>> 1 file changed, 16 insertions(+), 6 deletions(-) >>> >>> diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c >>> index b51d0836c3..cba6b87add 100644 >>> --- a/tests/checkasm/sw_rgb.c >>> +++ b/tests/checkasm/sw_rgb.c >>> @@ -187,11 +187,15 @@ static const int input_sizes[] = {8, 128, 1080, >>> MAX_LINE_SIZE}; >>> static const enum AVPixelFormat rgb_formats[] = { >>> AV_PIX_FMT_RGB24, >>> AV_PIX_FMT_BGR24, >>> + AV_PIX_FMT_RGBA, >>> + AV_PIX_FMT_BGRA, >>> + AV_PIX_FMT_ABGR, >>> + AV_PIX_FMT_ARGB, >>> }; >>> static void check_rgb_to_y(struct SwsContext *ctx) >>> { >>> - LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]); >>> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 4]); >>> LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]); >>> LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]); >>> @@ -199,7 +203,7 @@ static void check_rgb_to_y(struct SwsContext *ctx) >>> const uint8_t *unused1, const uint8_t *unused2, >>> int width, >>> uint32_t *rgb2yuv, void *opq); >>> - randomize_buffers(src, MAX_LINE_SIZE * 3); >>> + randomize_buffers(src, MAX_LINE_SIZE * 4); >>> for (int i = 0; i < FF_ARRAY_ELEMS(rgb_formats); i++) { >>> const AVPixFmtDescriptor *desc = >>> av_pix_fmt_desc_get(rgb_formats[i]); >>> @@ -220,7 +224,10 @@ static void check_rgb_to_y(struct SwsContext *ctx) >>> if (memcmp(dst0_y, dst1_y, w * 2)) >>> fail(); >>> - bench_new(dst1_y, src, NULL, NULL, w, >>> ctx->input_rgb2yuv_table, NULL); >>> + if (desc->nb_components == 3 || >>> + // only bench native endian formats >>> + (ctx->srcFormat == AV_PIX_FMT_RGB32 || >>> ctx->srcFormat == AV_PIX_FMT_RGB32_1)) >>> + bench_new(dst1_y, src, NULL, NULL, w, >>> ctx->input_rgb2yuv_table, NULL); >>> } >>> } >>> } >>> @@ -228,7 +235,7 @@ static void check_rgb_to_y(struct SwsContext *ctx) >>> static void check_rgb_to_uv(struct SwsContext *ctx) >>> { >>> - LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]); >>> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 4]); >> >> Doesn't this make the test less strict wrt overreading for tests that >> are only supposed to use MAX_LINE_SIZE * 3? > > Probably. Want me to add a second src buffer for this? > Proceed as you wish. >> >>> LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]); >>> LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]); >>> LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]); >>> @@ -238,7 +245,7 @@ static void check_rgb_to_uv(struct SwsContext *ctx) >>> const uint8_t *src1, const uint8_t *src2, const >>> uint8_t *src3, >>> int width, uint32_t *pal, void *opq); >>> - randomize_buffers(src, MAX_LINE_SIZE * 3); >>> + randomize_buffers(src, MAX_LINE_SIZE * 4); >>> for (int i = 0; i < 2 * FF_ARRAY_ELEMS(rgb_formats); i++) { >>> enum AVPixelFormat src_fmt = rgb_formats[i / 2]; >>> @@ -266,7 +273,10 @@ static void check_rgb_to_uv(struct SwsContext *ctx) >>> if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, >>> dst1_v, w * 2)) >>> fail(); >>> - bench_new(dst1_u, dst1_v, NULL, src, src, w, >>> ctx->input_rgb2yuv_table, NULL); >>> + if (desc->nb_components == 3 || >>> + // only bench native endian formats >>> + (ctx->srcFormat == AV_PIX_FMT_RGB32 || >>> ctx->srcFormat == AV_PIX_FMT_RGB32_1)) >>> + bench_new(dst1_u, dst1_v, NULL, src, src, w, >>> ctx->input_rgb2yuv_table, NULL); >>> } >>> } >>> } >> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> To unsubscribe, visit link above, or email >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c index b51d0836c3..cba6b87add 100644 --- a/tests/checkasm/sw_rgb.c +++ b/tests/checkasm/sw_rgb.c @@ -187,11 +187,15 @@ static const int input_sizes[] = {8, 128, 1080, MAX_LINE_SIZE}; static const enum AVPixelFormat rgb_formats[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGBA, + AV_PIX_FMT_BGRA, + AV_PIX_FMT_ABGR, + AV_PIX_FMT_ARGB, }; static void check_rgb_to_y(struct SwsContext *ctx) { - LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]); + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 4]); LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]); LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]); @@ -199,7 +203,7 @@ static void check_rgb_to_y(struct SwsContext *ctx) const uint8_t *unused1, const uint8_t *unused2, int width, uint32_t *rgb2yuv, void *opq); - randomize_buffers(src, MAX_LINE_SIZE * 3); + randomize_buffers(src, MAX_LINE_SIZE * 4); for (int i = 0; i < FF_ARRAY_ELEMS(rgb_formats); i++) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(rgb_formats[i]); @@ -220,7 +224,10 @@ static void check_rgb_to_y(struct SwsContext *ctx) if (memcmp(dst0_y, dst1_y, w * 2)) fail(); - bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL); + if (desc->nb_components == 3 || + // only bench native endian formats + (ctx->srcFormat == AV_PIX_FMT_RGB32 || ctx->srcFormat == AV_PIX_FMT_RGB32_1)) + bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL); } } } @@ -228,7 +235,7 @@ static void check_rgb_to_y(struct SwsContext *ctx) static void check_rgb_to_uv(struct SwsContext *ctx) { - LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]); + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 4]); LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]); LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]); LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]); @@ -238,7 +245,7 @@ static void check_rgb_to_uv(struct SwsContext *ctx) const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, int width, uint32_t *pal, void *opq); - randomize_buffers(src, MAX_LINE_SIZE * 3); + randomize_buffers(src, MAX_LINE_SIZE * 4); for (int i = 0; i < 2 * FF_ARRAY_ELEMS(rgb_formats); i++) { enum AVPixelFormat src_fmt = rgb_formats[i / 2]; @@ -266,7 +273,10 @@ static void check_rgb_to_uv(struct SwsContext *ctx) if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, dst1_v, w * 2)) fail(); - bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL); + if (desc->nb_components == 3 || + // only bench native endian formats + (ctx->srcFormat == AV_PIX_FMT_RGB32 || ctx->srcFormat == AV_PIX_FMT_RGB32_1)) + bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL); } } }
Test all four pixel formats, but only bench the two native endian ones for a given target. Signed-off-by: James Almer <jamrial@gmail.com> --- tests/checkasm/sw_rgb.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)